434626: [Diagram] change gmfgen to ensure that shape are generated

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

Change-Id: I61dc682a884a1c5e8a09bf5e619f25c7ae258fa6

636 files changed, 229025 insertions, 231604 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/.options b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/.options
index a1af7657767..c93f1f6fb7e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/.options
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/.options
@@ -1,7 +1,7 @@
-# Tracing options for the org.eclipse.papyrus.uml.diagram.composite plug-in
-
-# Common issues
-org.eclipse.papyrus.uml.diagram.composite/debug=false
-
-# Visual IDs
-org.eclipse.papyrus.uml.diagram.composite/debug/visualID=false
+# Tracing options for the org.eclipse.papyrus.uml.diagram.composite plug-in

+

+# Common issues

+org.eclipse.papyrus.uml.diagram.composite/debug=false

+

+# Visual IDs

+org.eclipse.papyrus.uml.diagram.composite/debug/visualID=false

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
index 589fb0c8926..9b003b14c13 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF
@@ -1,82 +1,82 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.diagram.composite,
- org.eclipse.papyrus.uml.diagram.composite.custom.actions,
- org.eclipse.papyrus.uml.diagram.composite.custom.edit.command,
- org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies,
- org.eclipse.papyrus.uml.diagram.composite.custom.figures,
- org.eclipse.papyrus.uml.diagram.composite.custom.helper,
- org.eclipse.papyrus.uml.diagram.composite.custom.locators,
- org.eclipse.papyrus.uml.diagram.composite.custom.parts,
- org.eclipse.papyrus.uml.diagram.composite.edit.commands,
- org.eclipse.papyrus.uml.diagram.composite.edit.helpers,
- org.eclipse.papyrus.uml.diagram.composite.edit.parts,
- org.eclipse.papyrus.uml.diagram.composite.edit.policies,
- org.eclipse.papyrus.uml.diagram.composite.parsers,
- org.eclipse.papyrus.uml.diagram.composite.part,
- org.eclipse.papyrus.uml.diagram.composite.preferences,
- org.eclipse.papyrus.uml.diagram.composite.providers,
- org.eclipse.papyrus.uml.diagram.composite.sheet
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.emf.ecore,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.core.expressions,
- org.eclipse.jface,
- org.eclipse.ui.views,
- org.eclipse.gmf.runtime.emf.core,
- org.eclipse.gmf.runtime.emf.commands.core,
- org.eclipse.gmf.runtime.emf.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.gmf.runtime.diagram.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui.providers,
- org.eclipse.gmf.runtime.diagram.ui.providers.ide,
- org.eclipse.gmf.runtime.diagram.ui.render,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,
- org.eclipse.uml2.uml,
- org.eclipse.gmf.runtime.draw2d.ui,
- org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.0.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.0",
- org.eclipse.papyrus.uml.appearance;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.0",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.uml.tools.extendedtypes;bundle-version="1.0.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",
- org.eclipse.uml2.uml.edit;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",
- org.eclipse.emf.ecore.xmi,
- org.eclipse.emf.edit.ui,
- org.eclipse.draw2d;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.ocl.ecore;visibility:=reexport,
- org.eclipse.emf.validation;visibility:=reexport,
- org.eclipse.gef,
- org.eclipse.gmf.tooling.runtime;bundle-version="3.0.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.0",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.0",
- org.eclipse.papyrus.views.properties;bundle-version="1.0.0",
- org.eclipse.papyrus.uml.diagram.synchronizeview;bundle-version="1.0.0"
-Bundle-Vendor: %providerName
-Eclipse-LazyStart: true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.composite; singleton:=true
+Manifest-Version: 1.0

+Export-Package: org.eclipse.papyrus.uml.diagram.composite,

+ org.eclipse.papyrus.uml.diagram.composite.custom.actions,

+ org.eclipse.papyrus.uml.diagram.composite.custom.edit.command,

+ org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies,

+ org.eclipse.papyrus.uml.diagram.composite.custom.figures,

+ org.eclipse.papyrus.uml.diagram.composite.custom.helper,

+ org.eclipse.papyrus.uml.diagram.composite.custom.locators,

+ org.eclipse.papyrus.uml.diagram.composite.custom.parts,

+ org.eclipse.papyrus.uml.diagram.composite.edit.commands,

+ org.eclipse.papyrus.uml.diagram.composite.edit.helpers,

+ org.eclipse.papyrus.uml.diagram.composite.edit.parts,

+ org.eclipse.papyrus.uml.diagram.composite.edit.policies,

+ org.eclipse.papyrus.uml.diagram.composite.parsers,

+ org.eclipse.papyrus.uml.diagram.composite.part,

+ org.eclipse.papyrus.uml.diagram.composite.preferences,

+ org.eclipse.papyrus.uml.diagram.composite.providers,

+ org.eclipse.papyrus.uml.diagram.composite.sheet

+Bundle-ActivationPolicy: lazy

+Bundle-ClassPath: .

+Bundle-Name: %pluginName

+Bundle-Localization: plugin

+Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Require-Bundle: org.eclipse.emf.ecore,

+ org.eclipse.core.runtime,

+ org.eclipse.core.resources,

+ org.eclipse.core.expressions,

+ org.eclipse.jface,

+ org.eclipse.ui.views,

+ org.eclipse.gmf.runtime.emf.core,

+ org.eclipse.gmf.runtime.emf.commands.core,

+ org.eclipse.gmf.runtime.emf.ui.properties,

+ org.eclipse.gmf.runtime.diagram.ui,

+ org.eclipse.gmf.runtime.diagram.ui.properties,

+ org.eclipse.gmf.runtime.diagram.ui.providers,

+ org.eclipse.gmf.runtime.diagram.ui.providers.ide,

+ org.eclipse.gmf.runtime.diagram.ui.render,

+ org.eclipse.gmf.runtime.diagram.ui.resources.editor,

+ org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,

+ org.eclipse.uml2.uml,

+ org.eclipse.gmf.runtime.draw2d.ui,

+ org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.0.0",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",

+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",

+ org.eclipse.papyrus.uml.service.types;bundle-version="1.0.0",

+ org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.0",

+ org.eclipse.papyrus.uml.appearance;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.0",

+ org.eclipse.ui.ide;bundle-version="3.8.0",

+ org.eclipse.papyrus.uml.tools.extendedtypes;bundle-version="1.0.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",

+ org.eclipse.uml2.uml.edit;bundle-version="4.0.0",

+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

+ org.eclipse.emf.ecore.xmi,

+ org.eclipse.emf.edit.ui,

+ org.eclipse.draw2d;visibility:=reexport,

+ org.eclipse.emf.ecore.edit;visibility:=reexport,

+ org.eclipse.ocl.ecore;visibility:=reexport,

+ org.eclipse.emf.validation;visibility:=reexport,

+ org.eclipse.gef,

+ org.eclipse.gmf.tooling.runtime;bundle-version="3.0.0",

+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.0.0",

+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.0.0",

+ org.eclipse.papyrus.views.properties;bundle-version="1.0.0",

+ org.eclipse.papyrus.uml.diagram.synchronizeview;bundle-version="1.0.0"

+Bundle-Vendor: %providerName

+Eclipse-LazyStart: true

+Bundle-Version: 1.0.0.qualifier

+Bundle-Activator: org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin

+Bundle-ManifestVersion: 2

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.composite; singleton:=true

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen
index 0a5b2390632..9de037ec419 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/model/compositediagram.gmfgen
@@ -133,7 +133,6 @@
         <labels visualID="5126" editPartClassName="PropertyPartNameEditPartCN" itemSemanticEditPolicyClassName="PropertyPartNameItemSemanticEditPolicyCN" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.PropertyLabelEditPolicy"/>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0">
@@ -162,7 +161,6 @@
         <labels visualID="5198" editPartClassName="CollaborationRoleNameEditPartCN" itemSemanticEditPolicyClassName="CollaborationRoleNameItemSemanticEditPolicyCN" readOnly="true" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}" editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -190,7 +188,6 @@
         <labels visualID="5127" editPartClassName="CollaborationUseNameEditPart" itemSemanticEditPolicyClassName="CollaborationUseNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CollaborationUseLabelEditPolicy"/>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0">
@@ -223,7 +220,6 @@
         <labels visualID="5128" editPartClassName="ActivityCompositeNameEditPartCN" itemSemanticEditPolicyClassName="ActivityCompositeNameItemSemanticEditPolicyCN" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -255,7 +251,6 @@
         <labels visualID="5129" editPartClassName="InteractionCompositeNameEditPartCN" itemSemanticEditPolicyClassName="InteractionCompositeNameItemSemanticEditPolicyCN" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -287,7 +282,6 @@
         <labels visualID="5130" editPartClassName="ProtocolStateMachineCompositeNameEditPartCN" itemSemanticEditPolicyClassName="ProtocolStateMachineCompositeNameItemSemanticEditPolicyCN" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -319,7 +313,6 @@
         <labels visualID="5131" editPartClassName="StateMachineCompositeNameEditPartCN" itemSemanticEditPolicyClassName="StateMachineCompositeNameItemSemanticEditPolicyCN" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -351,7 +344,6 @@
         <labels visualID="5132" editPartClassName="FunctionBehaviorCompositeNameEditPartCN" itemSemanticEditPolicyClassName="FunctionBehaviorCompositeNameItemSemanticEditPolicyCN" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -383,7 +375,6 @@
         <labels visualID="5133" editPartClassName="OpaqueBehaviorCompositeNameEditPartCN" itemSemanticEditPolicyClassName="OpaqueBehaviorCompositeNameItemSemanticEditPolicyCN" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -416,7 +407,6 @@
         <labels visualID="5137" editPartClassName="ComponentCompositeNameEditPartCN" itemSemanticEditPolicyClassName="ComponentCompositeNameItemSemanticEditPolicyCN" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -448,7 +438,6 @@
         <labels visualID="5138" editPartClassName="DeviceCompositeNameEditPartCN" itemSemanticEditPolicyClassName="DeviceCompositeNameItemSemanticEditPolicyCN" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -480,7 +469,6 @@
         <labels visualID="5139" editPartClassName="ExecutionEnvironmentCompositeNameEditPartCN" itemSemanticEditPolicyClassName="ExecutionEnvironmentCompositeNameItemSemanticEditPolicyCN" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -513,7 +501,6 @@
         <labels visualID="5140" editPartClassName="NodeCompositeNameEditPartCN" itemSemanticEditPolicyClassName="NodeCompositeNameItemSemanticEditPolicyCN" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -546,7 +533,6 @@
         <labels visualID="5155" editPartClassName="ClassCompositeNameEditPartCN" itemSemanticEditPolicyClassName="ClassCompositeNameItemSemanticEditPolicyCN" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -575,7 +561,6 @@
         <labels visualID="5141" editPartClassName="CollaborationCompositeNameEditPartCN" itemSemanticEditPolicyClassName="CollaborationCompositeNameItemSemanticEditPolicyCN" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -603,7 +588,6 @@
         <labels visualID="5154" editPartClassName="InterfaceNameEditPartCN" itemSemanticEditPolicyClassName="InterfaceNameItemSemanticEditPolicyCN" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -631,7 +615,6 @@
         <labels visualID="5134" editPartClassName="PrimitiveTypeNameEditPartCN" itemSemanticEditPolicyClassName="PrimitiveTypeNameItemSemanticEditPolicyCN" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -659,7 +642,6 @@
         <labels visualID="5135" editPartClassName="EnumerationNameEditPartCN" itemSemanticEditPolicyClassName="EnumerationNameItemSemanticEditPolicyCN" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -687,7 +669,6 @@
         <labels visualID="5136" editPartClassName="DataTypeNameEditPartCN" itemSemanticEditPolicyClassName="DataTypeNameItemSemanticEditPolicyCN" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -698,7 +679,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="ActorEditHelper"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedForeground="true"/>
         </viewmap>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
@@ -716,7 +696,6 @@
         <labels visualID="5144" editPartClassName="ActorNameEditPartCN" itemSemanticEditPolicyClassName="ActorNameItemSemanticEditPolicyCN" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -727,7 +706,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="DeploymentSpecificationEditHelper"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedForeground="true"/>
         </viewmap>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
@@ -744,7 +722,6 @@
         <labels visualID="5145" editPartClassName="DeploymentSpecificationNameEditPartCN" itemSemanticEditPolicyClassName="DeploymentSpecificationNameItemSemanticEditPolicyCN" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -755,7 +732,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="ArtifactEditHelper"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedForeground="true"/>
         </viewmap>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
@@ -773,7 +749,6 @@
         <labels visualID="5146" editPartClassName="ArtifactNameEditPartCN" itemSemanticEditPolicyClassName="ArtifactNameItemSemanticEditPolicyCN" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -829,7 +804,6 @@
         <labels visualID="5148" editPartClassName="SignalNameEditPartCN" itemSemanticEditPolicyClassName="SignalNameItemSemanticEditPolicyCN" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -840,7 +814,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="UseCaseEditHelper"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedForeground="true"/>
         </viewmap>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
@@ -858,7 +831,6 @@
         <labels visualID="5149" editPartClassName="UseCaseNameEditPartCN" itemSemanticEditPolicyClassName="UseCaseNameItemSemanticEditPolicyCN" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -883,7 +855,6 @@
         <labels visualID="5150" editPartClassName="CommentBodyEditPartCN" itemSemanticEditPolicyClassName="CommentBodyItemSemanticEditPolicyCN">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCornerBentFigure" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.3">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body"/>
@@ -911,7 +882,6 @@
         <labels visualID="6040" editPartClassName="DurationConstraintNameEditPartCN" itemSemanticEditPolicyClassName="DurationConstraintNameItemSemanticEditPolicyCN" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -947,7 +917,6 @@
         <labels visualID="6042" editPartClassName="TimeConstraintNameEditPartCN" itemSemanticEditPolicyClassName="TimeConstraintNameItemSemanticEditPolicyCN" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -983,7 +952,6 @@
         <labels visualID="6044" editPartClassName="IntervalConstraintNameEditPartCN" itemSemanticEditPolicyClassName="IntervalConstraintNameItemSemanticEditPolicyCN" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1019,7 +987,6 @@
         <labels visualID="6046" editPartClassName="InteractionConstraintNameEditPartCN" itemSemanticEditPolicyClassName="InteractionConstraintNameItemSemanticEditPolicyCN" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1055,7 +1022,6 @@
         <labels visualID="6048" editPartClassName="ConstraintNameEditPartCN" itemSemanticEditPolicyClassName="ConstraintNameItemSemanticEditPolicyCN" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1074,7 +1040,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:SpecializationType"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true"/>
         </viewmap>
         <modelFacet>
           <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Property"/>
@@ -1094,7 +1059,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:SpecializationType"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true"/>
         </viewmap>
         <modelFacet>
           <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Operation"/>
@@ -1114,7 +1078,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="EnumerationLiteralEditHelper"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true"/>
         </viewmap>
         <modelFacet>
           <metaClass href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/EnumerationLiteral"/>
@@ -1155,7 +1118,6 @@
         <labels visualID="5112" editPartClassName="ActivityCompositeNameEditPart" itemSemanticEditPolicyClassName="ActivityCompositeNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1187,7 +1149,6 @@
         <labels visualID="5113" editPartClassName="InteractionCompositeNameEditPart" itemSemanticEditPolicyClassName="InteractionCompositeNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1219,7 +1180,6 @@
         <labels visualID="5114" editPartClassName="ProtocolStateMachineCompositeNameEditPart" itemSemanticEditPolicyClassName="ProtocolStateMachineCompositeNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1251,7 +1211,6 @@
         <labels visualID="5115" editPartClassName="StateMachineCompositeNameEditPart" itemSemanticEditPolicyClassName="StateMachineCompositeNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1283,7 +1242,6 @@
         <labels visualID="5116" editPartClassName="FunctionBehaviorCompositeNameEditPart" itemSemanticEditPolicyClassName="FunctionBehaviorCompositeNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1315,7 +1273,6 @@
         <labels visualID="5117" editPartClassName="OpaqueBehaviorCompositeNameEditPart" itemSemanticEditPolicyClassName="OpaqueBehaviorCompositeNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1348,7 +1305,6 @@
         <labels visualID="5121" editPartClassName="ComponentCompositeNameEditPart" itemSemanticEditPolicyClassName="ComponentCompositeNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1380,7 +1336,6 @@
         <labels visualID="5122" editPartClassName="DeviceCompositeNameEditPart" itemSemanticEditPolicyClassName="DeviceCompositeNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1412,7 +1367,6 @@
         <labels visualID="5123" editPartClassName="ExecutionEnvironmentCompositeNameEditPart" itemSemanticEditPolicyClassName="ExecutionEnvironmentCompositeNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1445,7 +1399,6 @@
         <labels visualID="5124" editPartClassName="NodeCompositeNameEditPart" itemSemanticEditPolicyClassName="NodeCompositeNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1478,7 +1431,6 @@
         <labels visualID="5156" editPartClassName="ClassCompositeNameEditPart" itemSemanticEditPolicyClassName="ClassCompositeNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1507,7 +1459,6 @@
         <labels visualID="5158" editPartClassName="CollaborationCompositeNameEditPart" itemSemanticEditPolicyClassName="CollaborationCompositeNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1535,7 +1486,6 @@
         <labels visualID="5159" editPartClassName="InterfaceNameEditPart" itemSemanticEditPolicyClassName="InterfaceNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1563,7 +1513,6 @@
         <labels visualID="5118" editPartClassName="PrimitiveTypeNameEditPart" itemSemanticEditPolicyClassName="PrimitiveTypeNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1591,7 +1540,6 @@
         <labels visualID="5119" editPartClassName="EnumerationNameEditPart" itemSemanticEditPolicyClassName="EnumerationNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1619,7 +1567,6 @@
         <labels visualID="5120" editPartClassName="DataTypeNameEditPart" itemSemanticEditPolicyClassName="DataTypeNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1630,7 +1577,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:SpecializationType" metamodelType="/0/@diagram/@childNodes.22/@elementType"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedForeground="true"/>
         </viewmap>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
@@ -1648,7 +1594,6 @@
         <labels visualID="5160" editPartClassName="ActorNameEditPart" itemSemanticEditPolicyClassName="ActorNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1659,7 +1604,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:SpecializationType" metamodelType="/0/@diagram/@childNodes.23/@elementType"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedForeground="true"/>
         </viewmap>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
@@ -1676,7 +1620,6 @@
         <labels visualID="5161" editPartClassName="DeploymentSpecificationNameEditPart" itemSemanticEditPolicyClassName="DeploymentSpecificationNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1687,7 +1630,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:SpecializationType" metamodelType="/0/@diagram/@childNodes.24/@elementType"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedForeground="true"/>
         </viewmap>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
@@ -1705,7 +1647,6 @@
         <labels visualID="5162" editPartClassName="ArtifactNameEditPart" itemSemanticEditPolicyClassName="ArtifactNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1761,7 +1702,6 @@
         <labels visualID="5164" editPartClassName="SignalNameEditPart" itemSemanticEditPolicyClassName="SignalNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1772,7 +1712,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:SpecializationType" metamodelType="/0/@diagram/@childNodes.27/@elementType"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedForeground="true"/>
         </viewmap>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
@@ -1790,7 +1729,6 @@
         <labels visualID="5165" editPartClassName="UseCaseNameEditPart" itemSemanticEditPolicyClassName="UseCaseNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1801,7 +1739,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="SignalEventEditHelper"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedForeground="true"/>
         </viewmap>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
@@ -1818,7 +1755,7 @@
         <labels visualID="5166" editPartClassName="SignalEventNameEditPart" itemSemanticEditPolicyClassName="SignalEventNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
+
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1829,7 +1766,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="CallEventEditHelper"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedForeground="true"/>
         </viewmap>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
@@ -1846,7 +1782,6 @@
         <labels visualID="5167" editPartClassName="CallEventNameEditPart" itemSemanticEditPolicyClassName="CallEventNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1857,7 +1792,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="AnyReceiveEventEditHelper"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedForeground="true"/>
         </viewmap>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
@@ -1874,7 +1808,6 @@
         <labels visualID="5168" editPartClassName="AnyReceiveEventNameEditPart" itemSemanticEditPolicyClassName="AnyReceiveEventNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1885,7 +1818,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="ChangeEventEditHelper"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedForeground="true"/>
         </viewmap>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
@@ -1902,7 +1834,6 @@
         <labels visualID="5171" editPartClassName="ChangeEventNameEditPart" itemSemanticEditPolicyClassName="ChangeEventNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -1913,7 +1844,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="TimeEventEditHelper"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedForeground="true"/>
         </viewmap>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
@@ -1930,7 +1860,6 @@
         <labels visualID="5172" editPartClassName="TimeEventNameEditPart" itemSemanticEditPolicyClassName="TimeEventNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -2019,7 +1948,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="LiteralBooleanEditHelper"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedForeground="true"/>
         </viewmap>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
@@ -2036,7 +1964,6 @@
         <labels visualID="5178" editPartClassName="LiteralBooleanNameEditPart" itemSemanticEditPolicyClassName="LiteralBooleanNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -2047,7 +1974,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="LiteralIntegerEditHelper"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedForeground="true"/>
         </viewmap>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
@@ -2064,7 +1990,6 @@
         <labels visualID="5179" editPartClassName="LiteralIntegerNameEditPart" itemSemanticEditPolicyClassName="LiteralIntegerNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -2075,7 +2000,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="LiteralNullEditHelper"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedForeground="true"/>
         </viewmap>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
@@ -2092,7 +2016,6 @@
         <labels visualID="5180" editPartClassName="LiteralNullNameEditPart" itemSemanticEditPolicyClassName="LiteralNullNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -2103,7 +2026,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="LiteralStringEditHelper"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedForeground="true"/>
         </viewmap>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
@@ -2120,7 +2042,6 @@
         <labels visualID="5181" editPartClassName="LiteralStringNameEditPart" itemSemanticEditPolicyClassName="LiteralStringNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -2131,7 +2052,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="LiteralUnlimitedNaturalEditHelper"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedForeground="true"/>
         </viewmap>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
@@ -2148,7 +2068,6 @@
         <labels visualID="5182" editPartClassName="LiteralUnlimitedNaturalNameEditPart" itemSemanticEditPolicyClassName="LiteralUnlimitedNaturalNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -2159,7 +2078,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="StringExpressionEditHelper"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedForeground="true"/>
         </viewmap>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
@@ -2176,7 +2094,6 @@
         <labels visualID="5183" editPartClassName="StringExpressionNameEditPart" itemSemanticEditPolicyClassName="StringExpressionNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -2187,7 +2104,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="OpaqueExpressionEditHelper"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedForeground="true"/>
         </viewmap>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
@@ -2204,7 +2120,6 @@
         <labels visualID="5184" editPartClassName="OpaqueExpressionNameEditPart" itemSemanticEditPolicyClassName="OpaqueExpressionNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -2215,7 +2130,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="TimeExpressionEditHelper"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedForeground="true"/>
         </viewmap>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
@@ -2232,7 +2146,6 @@
         <labels visualID="5185" editPartClassName="TimeExpressionNameEditPart" itemSemanticEditPolicyClassName="TimeExpressionNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -2243,7 +2156,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="ExpressionEditHelper"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedForeground="true"/>
         </viewmap>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
@@ -2260,7 +2172,6 @@
         <labels visualID="5186" editPartClassName="ExpressionNameEditPart" itemSemanticEditPolicyClassName="ExpressionNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -2271,7 +2182,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="DurationEditHelper"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedForeground="true"/>
         </viewmap>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
@@ -2288,7 +2198,6 @@
         <labels visualID="5187" editPartClassName="DurationNameEditPart" itemSemanticEditPolicyClassName="DurationNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -2299,7 +2208,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="TimeIntervalEditHelper"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedForeground="true"/>
         </viewmap>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
@@ -2316,7 +2224,6 @@
         <labels visualID="5188" editPartClassName="TimeIntervalNameEditPart" itemSemanticEditPolicyClassName="TimeIntervalNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -2327,7 +2234,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="DurationIntervalEditHelper"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedForeground="true"/>
         </viewmap>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
@@ -2344,7 +2250,6 @@
         <labels visualID="5189" editPartClassName="DurationIntervalNameEditPart" itemSemanticEditPolicyClassName="DurationIntervalNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -2355,7 +2260,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="IntervalEditHelper"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedForeground="true"/>
         </viewmap>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
@@ -2372,7 +2276,6 @@
         <labels visualID="5190" editPartClassName="IntervalNameEditPart" itemSemanticEditPolicyClassName="IntervalNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -2383,7 +2286,6 @@
         <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
         <elementType xsi:type="gmfgen:MetamodelType" editHelperClassName="InstanceValueEditHelper"/>
         <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure">
-          <attributes xsi:type="gmfgen:StyleAttributes" fixedForeground="true"/>
         </viewmap>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy"/>
         <behaviour xsi:type="gmfgen:CustomBehaviour" key="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY" editPolicyQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy"/>
@@ -2400,7 +2302,6 @@
         <labels visualID="5191" editPartClassName="InstanceValueNameEditPart" itemSemanticEditPolicyClassName="InstanceValueNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true" fixedForeground="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="{0}  " editorPattern="{0}" editPattern="{0}">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -2425,7 +2326,6 @@
         <labels visualID="5192" editPartClassName="CommentBodyEditPart" itemSemanticEditPolicyClassName="CommentBodyItemSemanticEditPolicy">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getCornerBentFigure" figureQualifiedClassName="org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.3">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/Comment/body"/>
@@ -2453,7 +2353,6 @@
         <labels visualID="5193" editPartClassName="DurationConstraintNameEditPart" itemSemanticEditPolicyClassName="DurationConstraintNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -2489,7 +2388,6 @@
         <labels visualID="5194" editPartClassName="TimeConstraintNameEditPart" itemSemanticEditPolicyClassName="TimeConstraintNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -2525,7 +2423,6 @@
         <labels visualID="5195" editPartClassName="IntervalConstraintNameEditPart" itemSemanticEditPolicyClassName="IntervalConstraintNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -2561,7 +2458,6 @@
         <labels visualID="5196" editPartClassName="InteractionConstraintNameEditPart" itemSemanticEditPolicyClassName="InteractionConstraintNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
@@ -2597,7 +2493,6 @@
         <labels visualID="5197" editPartClassName="ConstraintNameEditPart" itemSemanticEditPolicyClassName="ConstraintNameItemSemanticEditPolicy" elementIcon="true">
           <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
           <viewmap xsi:type="gmfgen:ParentAssignedViewmap" getterName="getNameLabel" figureQualifiedClassName="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel">
-            <attributes xsi:type="gmfgen:StyleAttributes" fixedFont="true"/>
           </viewmap>
           <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" parser="/0/@labelParsers/@implementations.0" viewPattern="" editorPattern="" editPattern="">
             <metaFeatures href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/NamedElement/name"/>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml
index b307d3d7d85..a0ec17a668a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/plugin.xml
@@ -15,22 +15,22 @@
 -->
 <plugin>
 
-   <extension point="org.eclipse.ui.contexts" id="ui-context">
-				      <?gmfgen generated="true"?>
-				      <context
-				         description="%context.description"
-				         id="org.eclipse.papyrus.uml.diagram.composite.ui.diagramContext"
-				         name="%context.name"
-				         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">
-				      </context>
-				   </extension>
+   <extension point="org.eclipse.ui.contexts" id="ui-context">

+				      <?gmfgen generated="true"?>

+				      <context

+				         description="%context.description"

+				         id="org.eclipse.papyrus.uml.diagram.composite.ui.diagramContext"

+				         name="%context.name"

+				         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">

+				      </context>

+				   </extension>

       	
 
 
-   <extension point="org.eclipse.core.runtime.preferences" id="prefs">
-      <?gmfgen generated="true"?>
-      <initializer class="org.eclipse.papyrus.uml.diagram.composite.preferences.DiagramPreferenceInitializer"/>
-   </extension>
+   <extension point="org.eclipse.core.runtime.preferences" id="prefs">

+      <?gmfgen generated="true"?>

+      <initializer class="org.eclipse.papyrus.uml.diagram.composite.preferences.DiagramPreferenceInitializer"/>

+   </extension>

 
    <extension point="org.eclipse.ui.preferencePages" id="prefpages">
       <?gmfgen generated="false"?>
@@ -57,77 +57,77 @@
 
    </extension>
 
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">
-      <?gmfgen generated="true"?>
-      <propertyContributor
-            contributorId="org.eclipse.papyrus.uml.diagram.composite"
-            labelProvider="org.eclipse.papyrus.uml.diagram.composite.sheet.UMLSheetLabelProvider">
-         <propertyCategory category="domain"/>
-         <propertyCategory category="visual"/>
-         <propertyCategory category="extra"/>
-      </propertyContributor>
-   </extension>
-
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs">
-      <?gmfgen generated="true"?>   
-      <propertyTabs contributorId="org.eclipse.papyrus.uml.diagram.composite">
-         <propertyTab
-             category="visual"
-             id="property.tab.AppearancePropertySection"
-             label="%tab.appearance"/>
-          <propertyTab
-             category="visual"
-             id="property.tab.DiagramPropertySection"
-             label="%tab.diagram"/>
-          <propertyTab
-             category="domain"
-             id="property.tab.domain"
-             label="%tab.domain"/>
-      </propertyTabs>
-   </extension>
-
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections">
-      <?gmfgen generated="true"?>   
-      <propertySections contributorId="org.eclipse.papyrus.uml.diagram.composite">
-         <propertySection id="property.section.ConnectorAppearancePropertySection" 
-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ConnectionEditPartPropertySectionFilter" 
-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ConnectionAppearancePropertySection" 
-            tab="property.tab.AppearancePropertySection">
-         </propertySection>
-         <propertySection id="property.section.ShapeColorAndFontPropertySection" 
-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter" 
-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ShapeColorsAndFontsPropertySection" 
-            tab="property.tab.AppearancePropertySection">
-         </propertySection> 
-         <propertySection id="property.section.DiagramColorsAndFontsPropertySection" 
-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.DiagramColorsAndFontsPropertySection" 
-            tab="property.tab.AppearancePropertySection">
-         </propertySection>     
-         <propertySection id="property.section.RulerGridPropertySection" 
-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection" 
-            tab="property.tab.DiagramPropertySection">
-         </propertySection>     
-         <propertySection
-            id="property.section.domain" 
-            tab="property.tab.domain"
-            class="org.eclipse.papyrus.uml.diagram.composite.sheet.UMLPropertySection">
-            <input type="org.eclipse.gmf.runtime.notation.View"/>
-            <input type="org.eclipse.gef.EditPart"/>
-         </propertySection>
-      </propertySections>
-   </extension>
-
-   <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">
-      <?gmfgen generated="true"?>
-      <viewProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLViewProvider">
-         <Priority name="Lowest"/>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="CompositeStructure"/>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2060,2061,2062,2063,2064,2065,2069,2070,2071,2072,2073,2075,2076,2066,2067,2068,2077,2078,2079,2080,2081,2082,2083,2084,2085,2088,2089,2093,2094,2095,2096,2097,2098,2099,2100,2101,2102,2103,2104,2105,2106,2107,2108,2109,2110,2111,2112,2113,2114,3121,3069,3088,3070,3115,3071,3072,3073,3074,3075,3076,3077,3081,3082,3083,3084,3085,3086,3087,3078,3079,3080,3091,3092,3093,3094,3095,3096,3097,3116,3117,3118,3119,3120,3101,3102,3066"/>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4022,4001,4002,4003,4004,4005,4011,4006,4012,4007,4008,4009,4017,4010,4013,4015,4018,4019,4020,4021"/>
-      </viewProvider>
-   </extension>
+   <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">

+      <?gmfgen generated="true"?>

+      <propertyContributor

+            contributorId="org.eclipse.papyrus.uml.diagram.composite"

+            labelProvider="org.eclipse.papyrus.uml.diagram.composite.sheet.UMLSheetLabelProvider">

+         <propertyCategory category="domain"/>

+         <propertyCategory category="visual"/>

+         <propertyCategory category="extra"/>

+      </propertyContributor>

+   </extension>

+
+   <extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs">

+      <?gmfgen generated="true"?>   

+      <propertyTabs contributorId="org.eclipse.papyrus.uml.diagram.composite">

+         <propertyTab

+             category="visual"

+             id="property.tab.AppearancePropertySection"

+             label="%tab.appearance"/>

+          <propertyTab

+             category="visual"

+             id="property.tab.DiagramPropertySection"

+             label="%tab.diagram"/>

+          <propertyTab

+             category="domain"

+             id="property.tab.domain"

+             label="%tab.domain"/>

+      </propertyTabs>

+   </extension>

+
+   <extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections">

+      <?gmfgen generated="true"?>   

+      <propertySections contributorId="org.eclipse.papyrus.uml.diagram.composite">

+         <propertySection id="property.section.ConnectorAppearancePropertySection" 

+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ConnectionEditPartPropertySectionFilter" 

+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ConnectionAppearancePropertySection" 

+            tab="property.tab.AppearancePropertySection">

+         </propertySection>

+         <propertySection id="property.section.ShapeColorAndFontPropertySection" 

+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter" 

+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ShapeColorsAndFontsPropertySection" 

+            tab="property.tab.AppearancePropertySection">

+         </propertySection> 

+         <propertySection id="property.section.DiagramColorsAndFontsPropertySection" 

+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 

+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.DiagramColorsAndFontsPropertySection" 

+            tab="property.tab.AppearancePropertySection">

+         </propertySection>     

+         <propertySection id="property.section.RulerGridPropertySection" 

+            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 

+            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection" 

+            tab="property.tab.DiagramPropertySection">

+         </propertySection>     

+         <propertySection

+            id="property.section.domain" 

+            tab="property.tab.domain"

+            class="org.eclipse.papyrus.uml.diagram.composite.sheet.UMLPropertySection">

+            <input type="org.eclipse.gmf.runtime.notation.View"/>

+            <input type="org.eclipse.gef.EditPart"/>

+         </propertySection>

+      </propertySections>

+   </extension>

+
+   <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">

+      <?gmfgen generated="true"?>

+      <viewProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLViewProvider">

+         <Priority name="Lowest"/>

+         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="CompositeStructure"/>

+         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2060,2061,2062,2063,2064,2065,2069,2070,2071,2072,2073,2075,2076,2066,2067,2068,2077,2078,2079,2080,2081,2082,2083,2084,2085,2088,2089,2093,2094,2095,2096,2097,2098,2099,2100,2101,2102,2103,2104,2105,2106,2107,2108,2109,2110,2111,2112,2113,2114,3121,3069,3088,3070,3115,3071,3072,3073,3074,3075,3076,3077,3081,3082,3083,3084,3085,3086,3087,3078,3079,3080,3091,3092,3093,3094,3095,3096,3097,3116,3117,3118,3119,3120,3101,3102,3066"/>

+         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4022,4001,4002,4003,4004,4005,4011,4006,4012,4007,4008,4009,4017,4010,4013,4015,4018,4019,4020,4021"/>

+      </viewProvider>

+   </extension>

 
    <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider">
       <?gmfgen generated="false"?>
@@ -153,1175 +153,1175 @@
    </extension>
 
    
-   <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">
-      <?gmfgen generated="true"?>
-      <IconProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLIconProvider">
-         <Priority name="Low"/>
-      </IconProvider>
-   </extension>
-
-   <extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">
-      <?gmfgen generated="true"?>
-      <ParserProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider">
-         <Priority name="Lowest"/>
-      </ParserProvider>
-   </extension>
-
-   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">
-      <?gmfgen generated="true"?>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Package_1000"
-               name="%metatype.name.Package_1000"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Package"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.PackageEditHelper">
-            <param name="semanticHint" value="1000"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Activity_2060"
-               name="%metatype.name.Activity_2060"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Activity"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ActivityEditHelper">
-            <param name="semanticHint" value="2060"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Interaction_2061"
-               name="%metatype.name.Interaction_2061"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Interaction"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InteractionEditHelper">
-            <param name="semanticHint" value="2061"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_2062"
-               name="%metatype.name.ProtocolStateMachine_2062"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="ProtocolStateMachine"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ProtocolStateMachineEditHelper">
-            <param name="semanticHint" value="2062"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.StateMachine_2063"
-               name="%metatype.name.StateMachine_2063"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="StateMachine"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.StateMachineEditHelper">
-            <param name="semanticHint" value="2063"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_2064"
-               name="%metatype.name.FunctionBehavior_2064"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="FunctionBehavior"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.FunctionBehaviorEditHelper">
-            <param name="semanticHint" value="2064"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_2065"
-               name="%metatype.name.OpaqueBehavior_2065"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="OpaqueBehavior"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.OpaqueBehaviorEditHelper">
-            <param name="semanticHint" value="2065"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Component_2069"
-               name="%metatype.name.Component_2069"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Component"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ComponentEditHelper">
-            <param name="semanticHint" value="2069"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Device_2070"
-               name="%metatype.name.Device_2070"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Device"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DeviceEditHelper">
-            <param name="semanticHint" value="2070"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_2071"
-               name="%metatype.name.ExecutionEnvironment_2071"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="ExecutionEnvironment"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ExecutionEnvironmentEditHelper">
-            <param name="semanticHint" value="2071"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Node_2072"
-               name="%metatype.name.Node_2072"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Node"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.NodeEditHelper">
-            <param name="semanticHint" value="2072"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Class_2073"
-               name="%metatype.name.Class_2073"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Class"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ClassEditHelper">
-            <param name="semanticHint" value="2073"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Collaboration_2075"
-               name="%metatype.name.Collaboration_2075"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Collaboration_3086"/>
-            <param name="semanticHint" value="2075"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Interface_2076"
-               name="%metatype.name.Interface_2076"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Interface_3087"/>
-            <param name="semanticHint" value="2076"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_2066"
-               name="%metatype.name.PrimitiveType_2066"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="PrimitiveType"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.PrimitiveTypeEditHelper">
-            <param name="semanticHint" value="2066"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Enumeration_2067"
-               name="%metatype.name.Enumeration_2067"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Enumeration"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.EnumerationEditHelper">
-            <param name="semanticHint" value="2067"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.DataType_2068"
-               name="%metatype.name.DataType_2068"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="DataType"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DataTypeEditHelper">
-            <param name="semanticHint" value="2068"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Actor_2077"
-               name="%metatype.name.Actor_2077"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Actor_3091"/>
-            <param name="semanticHint" value="2077"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_2078"
-               name="%metatype.name.DeploymentSpecification_2078"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_3092"/>
-            <param name="semanticHint" value="2078"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Artifact_2079"
-               name="%metatype.name.Artifact_2079"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Artifact_3093"/>
-            <param name="semanticHint" value="2079"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.InformationItem_2080"
-               name="%metatype.name.InformationItem_2080"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.InformationItem_3094"/>
-            <param name="semanticHint" value="2080"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Signal_2081"
-               name="%metatype.name.Signal_2081"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Signal_3095"/>
-            <param name="semanticHint" value="2081"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.UseCase_2082"
-               name="%metatype.name.UseCase_2082"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.UseCase_3096"/>
-            <param name="semanticHint" value="2082"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.SignalEvent_2083"
-               name="%metatype.name.SignalEvent_2083"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="SignalEvent"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.SignalEventEditHelper">
-            <param name="semanticHint" value="2083"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.CallEvent_2084"
-               name="%metatype.name.CallEvent_2084"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="CallEvent"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.CallEventEditHelper">
-            <param name="semanticHint" value="2084"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.AnyReceiveEvent_2085"
-               name="%metatype.name.AnyReceiveEvent_2085"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="AnyReceiveEvent"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.AnyReceiveEventEditHelper">
-            <param name="semanticHint" value="2085"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.ChangeEvent_2088"
-               name="%metatype.name.ChangeEvent_2088"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="ChangeEvent"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ChangeEventEditHelper">
-            <param name="semanticHint" value="2088"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.TimeEvent_2089"
-               name="%metatype.name.TimeEvent_2089"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="TimeEvent"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.TimeEventEditHelper">
-            <param name="semanticHint" value="2089"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.DurationObservation_2093"
-               name="%metatype.name.DurationObservation_2093"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="DurationObservation"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DurationObservationEditHelper">
-            <param name="semanticHint" value="2093"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.TimeObservation_2094"
-               name="%metatype.name.TimeObservation_2094"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="TimeObservation"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.TimeObservationEditHelper">
-            <param name="semanticHint" value="2094"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.LiteralBoolean_2095"
-               name="%metatype.name.LiteralBoolean_2095"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="LiteralBoolean"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.LiteralBooleanEditHelper">
-            <param name="semanticHint" value="2095"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.LiteralInteger_2096"
-               name="%metatype.name.LiteralInteger_2096"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="LiteralInteger"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.LiteralIntegerEditHelper">
-            <param name="semanticHint" value="2096"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.LiteralNull_2097"
-               name="%metatype.name.LiteralNull_2097"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="LiteralNull"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.LiteralNullEditHelper">
-            <param name="semanticHint" value="2097"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.LiteralString_2098"
-               name="%metatype.name.LiteralString_2098"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="LiteralString"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.LiteralStringEditHelper">
-            <param name="semanticHint" value="2098"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.LiteralUnlimitedNatural_2099"
-               name="%metatype.name.LiteralUnlimitedNatural_2099"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="LiteralUnlimitedNatural"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.LiteralUnlimitedNaturalEditHelper">
-            <param name="semanticHint" value="2099"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.StringExpression_2100"
-               name="%metatype.name.StringExpression_2100"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="StringExpression"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.StringExpressionEditHelper">
-            <param name="semanticHint" value="2100"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.OpaqueExpression_2101"
-               name="%metatype.name.OpaqueExpression_2101"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="OpaqueExpression"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.OpaqueExpressionEditHelper">
-            <param name="semanticHint" value="2101"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.TimeExpression_2102"
-               name="%metatype.name.TimeExpression_2102"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="TimeExpression"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.TimeExpressionEditHelper">
-            <param name="semanticHint" value="2102"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Expression_2103"
-               name="%metatype.name.Expression_2103"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Expression"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ExpressionEditHelper">
-            <param name="semanticHint" value="2103"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Duration_2104"
-               name="%metatype.name.Duration_2104"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Duration"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DurationEditHelper">
-            <param name="semanticHint" value="2104"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.TimeInterval_2105"
-               name="%metatype.name.TimeInterval_2105"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="TimeInterval"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.TimeIntervalEditHelper">
-            <param name="semanticHint" value="2105"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.DurationInterval_2106"
-               name="%metatype.name.DurationInterval_2106"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="DurationInterval"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DurationIntervalEditHelper">
-            <param name="semanticHint" value="2106"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Interval_2107"
-               name="%metatype.name.Interval_2107"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Interval"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.IntervalEditHelper">
-            <param name="semanticHint" value="2107"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.InstanceValue_2108"
-               name="%metatype.name.InstanceValue_2108"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="InstanceValue"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InstanceValueEditHelper">
-            <param name="semanticHint" value="2108"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Comment_2109"
-               name="%metatype.name.Comment_2109"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Comment_3097"/>
-            <param name="semanticHint" value="2109"/>
-         </specializationType>
-      </metamodel>
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_2110"
-               name="%metatype.name.DurationConstraint_2110"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="2110"/>
-         </specializationType>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_2111"
-               name="%metatype.name.TimeConstraint_2111"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="TimeConstraint"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.TimeConstraintEditHelper">
-            <param name="semanticHint" value="2111"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_2112"
-               name="%metatype.name.IntervalConstraint_2112"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="IntervalConstraint"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.IntervalConstraintEditHelper">
-            <param name="semanticHint" value="2112"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_2113"
-               name="%metatype.name.InteractionConstraint_2113"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="InteractionConstraint"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InteractionConstraintEditHelper">
-            <param name="semanticHint" value="2113"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Constraint_2114"
-               name="%metatype.name.Constraint_2114"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Constraint"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ConstraintEditHelper">
-            <param name="semanticHint" value="2114"/>
-         </metamodelType>
-      </metamodel>
-      <specializationType
-            id="org.eclipse.papyrus.uml.diagram.composite.Node_3121"
-            name="%metatype.name.Node_3121"
-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-         <param name="semanticHint" value="3121"/>
-      </specializationType>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Port_3069"
-               name="%metatype.name.Port_3069"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Port"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.PortEditHelper">
-            <param name="semanticHint" value="3069"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Parameter_3088"
-               name="%metatype.name.Parameter_3088"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Parameter"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ParameterEditHelper">
-            <param name="semanticHint" value="3088"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Property_3070"
-               name="%metatype.name.Property_3070"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Property"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.PropertyEditHelper">
-            <param name="semanticHint" value="3070"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.prototype.CollaborationRole_3115"
-               name="%metatype.name.ConnectableElement_3115"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="ConnectableElement"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.CollaborationRoleEditHelper">
-            <param name="semanticHint" value="3115"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.CollaborationUse_3071"
-               name="%metatype.name.CollaborationUse_3071"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="CollaborationUse"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.CollaborationUseEditHelper">
-            <param name="semanticHint" value="3071"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Activity_3072"
-               name="%metatype.name.Activity_3072"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Activity_2060"/>
-            <param name="semanticHint" value="3072"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Interaction_3073"
-               name="%metatype.name.Interaction_3073"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Interaction_2061"/>
-            <param name="semanticHint" value="3073"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_3074"
-               name="%metatype.name.ProtocolStateMachine_3074"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_2062"/>
-            <param name="semanticHint" value="3074"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.StateMachine_3075"
-               name="%metatype.name.StateMachine_3075"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.StateMachine_2063"/>
-            <param name="semanticHint" value="3075"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_3076"
-               name="%metatype.name.FunctionBehavior_3076"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_2064"/>
-            <param name="semanticHint" value="3076"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_3077"
-               name="%metatype.name.OpaqueBehavior_3077"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_2065"/>
-            <param name="semanticHint" value="3077"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Component_3081"
-               name="%metatype.name.Component_3081"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Component_2069"/>
-            <param name="semanticHint" value="3081"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Device_3082"
-               name="%metatype.name.Device_3082"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Device_2070"/>
-            <param name="semanticHint" value="3082"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_3083"
-               name="%metatype.name.ExecutionEnvironment_3083"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_2071"/>
-            <param name="semanticHint" value="3083"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Node_3084"
-               name="%metatype.name.Node_3084"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Node_2072"/>
-            <param name="semanticHint" value="3084"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Class_3085"
-               name="%metatype.name.Class_3085"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Class_2073"/>
-            <param name="semanticHint" value="3085"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Collaboration_3086"
-               name="%metatype.name.Collaboration_3086"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Collaboration"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.CollaborationEditHelper">
-            <param name="semanticHint" value="3086"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Interface_3087"
-               name="%metatype.name.Interface_3087"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Interface"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InterfaceEditHelper">
-            <param name="semanticHint" value="3087"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_3078"
-               name="%metatype.name.PrimitiveType_3078"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_2066"/>
-            <param name="semanticHint" value="3078"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Enumeration_3079"
-               name="%metatype.name.Enumeration_3079"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Enumeration_2067"/>
-            <param name="semanticHint" value="3079"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.DataType_3080"
-               name="%metatype.name.DataType_3080"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.papyrus.uml.diagram.composite.DataType_2068"/>
-            <param name="semanticHint" value="3080"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Actor_3091"
-               name="%metatype.name.Actor_3091"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Actor"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ActorEditHelper">
-            <param name="semanticHint" value="3091"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_3092"
-               name="%metatype.name.DeploymentSpecification_3092"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="DeploymentSpecification"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DeploymentSpecificationEditHelper">
-            <param name="semanticHint" value="3092"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Artifact_3093"
-               name="%metatype.name.Artifact_3093"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Artifact"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ArtifactEditHelper">
-            <param name="semanticHint" value="3093"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.InformationItem_3094"
-               name="%metatype.name.InformationItem_3094"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="InformationItem"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InformationItemEditHelper">
-            <param name="semanticHint" value="3094"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Signal_3095"
-               name="%metatype.name.Signal_3095"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Signal"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.SignalEditHelper">
-            <param name="semanticHint" value="3095"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.UseCase_3096"
-               name="%metatype.name.UseCase_3096"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="UseCase"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.UseCaseEditHelper">
-            <param name="semanticHint" value="3096"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Comment_3097"
-               name="%metatype.name.Comment_3097"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Comment"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.CommentEditHelper">
-            <param name="semanticHint" value="3097"/>
-         </metamodelType>
-      </metamodel>
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_3116"
-               name="%metatype.name.DurationConstraint_3116"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="3116"/>
-         </specializationType>
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_3117"
-               name="%metatype.name.TimeConstraint_3117"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="3117"/>
-         </specializationType>
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_3118"
-               name="%metatype.name.IntervalConstraint_3118"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="3118"/>
-         </specializationType>
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_3119"
-               name="%metatype.name.InteractionConstraint_3119"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="3119"/>
-         </specializationType>
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Constraint_3120"
-               name="%metatype.name.Constraint_3120"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="3120"/>
-         </specializationType>
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Property_3101"
-               name="%metatype.name.Property_3101"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="3101"/>
-         </specializationType>
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Operation_3102"
-               name="%metatype.name.Operation_3102"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="3102"/>
-         </specializationType>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.EnumerationLiteral_3066"
-               name="%metatype.name.EnumerationLiteral_3066"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="EnumerationLiteral"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.EnumerationLiteralEditHelper">
-            <param name="semanticHint" value="3066"/>
-         </metamodelType>
-      </metamodel>
-      <specializationType
-            id="org.eclipse.papyrus.uml.diagram.composite.Link_4022"
-            name="%metatype.name.Link_4022"
-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-         <param name="semanticHint" value="4022"/>
-      </specializationType>
-      <specializationType
-            id="org.eclipse.papyrus.uml.diagram.composite.Link_4001"
-            name="%metatype.name.Link_4001"
-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-         <param name="semanticHint" value="4001"/>
-      </specializationType>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.CommentAnnotatedElement_4002"
-               name="%metatype.name.CommentAnnotatedElement_4002"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="4002"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.ConstraintConstrainedElement_4003"
-               name="%metatype.name.ConstraintConstrainedElement_4003"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="4003"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.ComponentRealization_4004"
-               name="%metatype.name.ComponentRealization_4004"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="ComponentRealization"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ComponentRealizationEditHelper">
-            <param name="semanticHint" value="4004"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.InterfaceRealization_4005"
-               name="%metatype.name.InterfaceRealization_4005"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="InterfaceRealization"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InterfaceRealizationEditHelper">
-            <param name="semanticHint" value="4005"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Substitution_4011"
-               name="%metatype.name.Substitution_4011"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Substitution"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.SubstitutionEditHelper">
-            <param name="semanticHint" value="4011"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Realization_4006"
-               name="%metatype.name.Realization_4006"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Realization"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.RealizationEditHelper">
-            <param name="semanticHint" value="4006"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Manifestation_4012"
-               name="%metatype.name.Manifestation_4012"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Manifestation"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ManifestationEditHelper">
-            <param name="semanticHint" value="4012"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007"
-               name="%metatype.name.Abstraction_4007"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Abstraction"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.AbstractionEditHelper">
-            <param name="semanticHint" value="4007"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Usage_4008"
-               name="%metatype.name.Usage_4008"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Usage"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.UsageEditHelper">
-            <param name="semanticHint" value="4008"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Deployment_4009"
-               name="%metatype.name.Deployment_4009"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Deployment"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DeploymentEditHelper">
-            <param name="semanticHint" value="4009"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.RoleBinding_4017"
-               name="%metatype.name.Dependency_4017"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Dependency"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.RoleBindingEditHelper">
-            <param name="semanticHint" value="4017"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Dependency_4010"
-               name="%metatype.name.Dependency_4010"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Dependency"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DependencyEditHelper">
-            <param name="semanticHint" value="4010"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Connector_4013"
-               name="%metatype.name.Connector_4013"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Connector"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ConnectorEditHelper">
-            <param name="semanticHint" value="4013"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.Generalization_4015"
-               name="%metatype.name.Generalization_4015"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="Generalization"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.GeneralizationEditHelper">
-            <param name="semanticHint" value="4015"/>
-         </metamodelType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.TimeObservationEvent_4018"
-               name="%metatype.name.TimeObservationEvent_4018"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="4018"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.DurationObservationEvent_4019"
-               name="%metatype.name.DurationObservationEvent_4019"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="4019"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <specializationType
-               id="org.eclipse.papyrus.uml.diagram.composite.Representation_4020"
-               name="%metatype.name.InformationItemRepresented_4020"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
-            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-            <param name="semanticHint" value="4020"/>
-         </specializationType>
-      </metamodel>
-      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-         <metamodelType
-               id="org.eclipse.papyrus.uml.diagram.composite.InformationFlow_4021"
-               name="%metatype.name.InformationFlow_4021"
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="InformationFlow"
-               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InformationFlowEditHelper">
-            <param name="semanticHint" value="4021"/>
-         </metamodelType>
-      </metamodel>
-   </extension>
-
-   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">
-      <?gmfgen generated="true"?>
-      <clientContext id="org.eclipse.papyrus.uml.diagram.composite.TypeContext">
-         <enablement>
-            <test
-               property="org.eclipse.gmf.runtime.emf.core.editingDomain"
-               value="org.eclipse.papyrus.uml.diagram.composite.EditingDomain"/>
-         </enablement>
-      </clientContext> 
-      <binding context="org.eclipse.papyrus.uml.diagram.composite.TypeContext">
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Package_1000"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Activity_2060"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interaction_2061"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_2062"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.StateMachine_2063"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_2064"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_2065"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Component_2069"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Device_2070"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_2071"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Node_2072"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Class_2073"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Collaboration_2075"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interface_2076"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_2066"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Enumeration_2067"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DataType_2068"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Actor_2077"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_2078"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Artifact_2079"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InformationItem_2080"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Signal_2081"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.UseCase_2082"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.SignalEvent_2083"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.CallEvent_2084"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.AnyReceiveEvent_2085"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ChangeEvent_2088"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeEvent_2089"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationObservation_2093"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeObservation_2094"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralBoolean_2095"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralInteger_2096"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralNull_2097"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralString_2098"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralUnlimitedNatural_2099"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.StringExpression_2100"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.OpaqueExpression_2101"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeExpression_2102"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Expression_2103"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Duration_2104"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeInterval_2105"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationInterval_2106"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interval_2107"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InstanceValue_2108"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Comment_2109"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_2110"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_2111"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_2112"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_2113"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Constraint_2114"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Node_3121"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Port_3069"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Parameter_3088"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Property_3070"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.prototype.CollaborationRole_3115"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.CollaborationUse_3071"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Activity_3072"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interaction_3073"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_3074"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.StateMachine_3075"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_3076"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_3077"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Component_3081"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Device_3082"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_3083"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Node_3084"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Class_3085"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Collaboration_3086"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interface_3087"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_3078"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Enumeration_3079"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DataType_3080"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Actor_3091"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_3092"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Artifact_3093"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InformationItem_3094"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Signal_3095"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.UseCase_3096"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Comment_3097"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_3116"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_3117"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_3118"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_3119"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Constraint_3120"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Property_3101"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Operation_3102"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.EnumerationLiteral_3066"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Link_4022"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Link_4001"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.CommentAnnotatedElement_4002"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ConstraintConstrainedElement_4003"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ComponentRealization_4004"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InterfaceRealization_4005"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Substitution_4011"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Realization_4006"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Manifestation_4012"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Usage_4008"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Deployment_4009"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.RoleBinding_4017"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Dependency_4010"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Connector_4013"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Generalization_4015"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeObservationEvent_4018"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationObservationEvent_4019"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Representation_4020"/>
-         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InformationFlow_4021"/>
-         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
-      </binding>
-   </extension>
+   <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">

+      <?gmfgen generated="true"?>

+      <IconProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLIconProvider">

+         <Priority name="Low"/>

+      </IconProvider>

+   </extension>

+
+   <extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">

+      <?gmfgen generated="true"?>

+      <ParserProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider">

+         <Priority name="Lowest"/>

+      </ParserProvider>

+   </extension>

+
+   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">

+      <?gmfgen generated="true"?>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Package_1000"

+               name="%metatype.name.Package_1000"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Package"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.PackageEditHelper">

+            <param name="semanticHint" value="1000"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Activity_2060"

+               name="%metatype.name.Activity_2060"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Activity"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ActivityEditHelper">

+            <param name="semanticHint" value="2060"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Interaction_2061"

+               name="%metatype.name.Interaction_2061"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Interaction"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InteractionEditHelper">

+            <param name="semanticHint" value="2061"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_2062"

+               name="%metatype.name.ProtocolStateMachine_2062"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="ProtocolStateMachine"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ProtocolStateMachineEditHelper">

+            <param name="semanticHint" value="2062"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.StateMachine_2063"

+               name="%metatype.name.StateMachine_2063"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="StateMachine"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.StateMachineEditHelper">

+            <param name="semanticHint" value="2063"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_2064"

+               name="%metatype.name.FunctionBehavior_2064"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="FunctionBehavior"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.FunctionBehaviorEditHelper">

+            <param name="semanticHint" value="2064"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_2065"

+               name="%metatype.name.OpaqueBehavior_2065"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="OpaqueBehavior"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.OpaqueBehaviorEditHelper">

+            <param name="semanticHint" value="2065"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Component_2069"

+               name="%metatype.name.Component_2069"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Component"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ComponentEditHelper">

+            <param name="semanticHint" value="2069"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Device_2070"

+               name="%metatype.name.Device_2070"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Device"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DeviceEditHelper">

+            <param name="semanticHint" value="2070"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_2071"

+               name="%metatype.name.ExecutionEnvironment_2071"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="ExecutionEnvironment"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ExecutionEnvironmentEditHelper">

+            <param name="semanticHint" value="2071"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Node_2072"

+               name="%metatype.name.Node_2072"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Node"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.NodeEditHelper">

+            <param name="semanticHint" value="2072"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Class_2073"

+               name="%metatype.name.Class_2073"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Class"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ClassEditHelper">

+            <param name="semanticHint" value="2073"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.Collaboration_2075"

+               name="%metatype.name.Collaboration_2075"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Collaboration_3086"/>

+            <param name="semanticHint" value="2075"/>

+         </specializationType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.Interface_2076"

+               name="%metatype.name.Interface_2076"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Interface_3087"/>

+            <param name="semanticHint" value="2076"/>

+         </specializationType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_2066"

+               name="%metatype.name.PrimitiveType_2066"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="PrimitiveType"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.PrimitiveTypeEditHelper">

+            <param name="semanticHint" value="2066"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Enumeration_2067"

+               name="%metatype.name.Enumeration_2067"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Enumeration"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.EnumerationEditHelper">

+            <param name="semanticHint" value="2067"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.DataType_2068"

+               name="%metatype.name.DataType_2068"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="DataType"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DataTypeEditHelper">

+            <param name="semanticHint" value="2068"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.Actor_2077"

+               name="%metatype.name.Actor_2077"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Actor_3091"/>

+            <param name="semanticHint" value="2077"/>

+         </specializationType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_2078"

+               name="%metatype.name.DeploymentSpecification_2078"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_3092"/>

+            <param name="semanticHint" value="2078"/>

+         </specializationType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.Artifact_2079"

+               name="%metatype.name.Artifact_2079"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Artifact_3093"/>

+            <param name="semanticHint" value="2079"/>

+         </specializationType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.InformationItem_2080"

+               name="%metatype.name.InformationItem_2080"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.InformationItem_3094"/>

+            <param name="semanticHint" value="2080"/>

+         </specializationType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.Signal_2081"

+               name="%metatype.name.Signal_2081"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Signal_3095"/>

+            <param name="semanticHint" value="2081"/>

+         </specializationType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.UseCase_2082"

+               name="%metatype.name.UseCase_2082"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.UseCase_3096"/>

+            <param name="semanticHint" value="2082"/>

+         </specializationType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.SignalEvent_2083"

+               name="%metatype.name.SignalEvent_2083"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="SignalEvent"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.SignalEventEditHelper">

+            <param name="semanticHint" value="2083"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.CallEvent_2084"

+               name="%metatype.name.CallEvent_2084"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="CallEvent"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.CallEventEditHelper">

+            <param name="semanticHint" value="2084"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.AnyReceiveEvent_2085"

+               name="%metatype.name.AnyReceiveEvent_2085"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="AnyReceiveEvent"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.AnyReceiveEventEditHelper">

+            <param name="semanticHint" value="2085"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.ChangeEvent_2088"

+               name="%metatype.name.ChangeEvent_2088"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="ChangeEvent"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ChangeEventEditHelper">

+            <param name="semanticHint" value="2088"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.TimeEvent_2089"

+               name="%metatype.name.TimeEvent_2089"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="TimeEvent"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.TimeEventEditHelper">

+            <param name="semanticHint" value="2089"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.DurationObservation_2093"

+               name="%metatype.name.DurationObservation_2093"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="DurationObservation"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DurationObservationEditHelper">

+            <param name="semanticHint" value="2093"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.TimeObservation_2094"

+               name="%metatype.name.TimeObservation_2094"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="TimeObservation"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.TimeObservationEditHelper">

+            <param name="semanticHint" value="2094"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.LiteralBoolean_2095"

+               name="%metatype.name.LiteralBoolean_2095"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="LiteralBoolean"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.LiteralBooleanEditHelper">

+            <param name="semanticHint" value="2095"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.LiteralInteger_2096"

+               name="%metatype.name.LiteralInteger_2096"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="LiteralInteger"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.LiteralIntegerEditHelper">

+            <param name="semanticHint" value="2096"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.LiteralNull_2097"

+               name="%metatype.name.LiteralNull_2097"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="LiteralNull"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.LiteralNullEditHelper">

+            <param name="semanticHint" value="2097"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.LiteralString_2098"

+               name="%metatype.name.LiteralString_2098"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="LiteralString"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.LiteralStringEditHelper">

+            <param name="semanticHint" value="2098"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.LiteralUnlimitedNatural_2099"

+               name="%metatype.name.LiteralUnlimitedNatural_2099"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="LiteralUnlimitedNatural"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.LiteralUnlimitedNaturalEditHelper">

+            <param name="semanticHint" value="2099"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.StringExpression_2100"

+               name="%metatype.name.StringExpression_2100"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="StringExpression"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.StringExpressionEditHelper">

+            <param name="semanticHint" value="2100"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.OpaqueExpression_2101"

+               name="%metatype.name.OpaqueExpression_2101"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="OpaqueExpression"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.OpaqueExpressionEditHelper">

+            <param name="semanticHint" value="2101"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.TimeExpression_2102"

+               name="%metatype.name.TimeExpression_2102"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="TimeExpression"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.TimeExpressionEditHelper">

+            <param name="semanticHint" value="2102"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Expression_2103"

+               name="%metatype.name.Expression_2103"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Expression"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ExpressionEditHelper">

+            <param name="semanticHint" value="2103"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Duration_2104"

+               name="%metatype.name.Duration_2104"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Duration"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DurationEditHelper">

+            <param name="semanticHint" value="2104"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.TimeInterval_2105"

+               name="%metatype.name.TimeInterval_2105"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="TimeInterval"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.TimeIntervalEditHelper">

+            <param name="semanticHint" value="2105"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.DurationInterval_2106"

+               name="%metatype.name.DurationInterval_2106"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="DurationInterval"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DurationIntervalEditHelper">

+            <param name="semanticHint" value="2106"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Interval_2107"

+               name="%metatype.name.Interval_2107"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Interval"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.IntervalEditHelper">

+            <param name="semanticHint" value="2107"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.InstanceValue_2108"

+               name="%metatype.name.InstanceValue_2108"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="InstanceValue"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InstanceValueEditHelper">

+            <param name="semanticHint" value="2108"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.Comment_2109"

+               name="%metatype.name.Comment_2109"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Comment_3097"/>

+            <param name="semanticHint" value="2109"/>

+         </specializationType>

+      </metamodel>

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_2110"

+               name="%metatype.name.DurationConstraint_2110"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

+            <param name="semanticHint" value="2110"/>

+         </specializationType>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_2111"

+               name="%metatype.name.TimeConstraint_2111"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="TimeConstraint"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.TimeConstraintEditHelper">

+            <param name="semanticHint" value="2111"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_2112"

+               name="%metatype.name.IntervalConstraint_2112"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="IntervalConstraint"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.IntervalConstraintEditHelper">

+            <param name="semanticHint" value="2112"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_2113"

+               name="%metatype.name.InteractionConstraint_2113"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="InteractionConstraint"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InteractionConstraintEditHelper">

+            <param name="semanticHint" value="2113"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Constraint_2114"

+               name="%metatype.name.Constraint_2114"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Constraint"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ConstraintEditHelper">

+            <param name="semanticHint" value="2114"/>

+         </metamodelType>

+      </metamodel>

+      <specializationType

+            id="org.eclipse.papyrus.uml.diagram.composite.Node_3121"

+            name="%metatype.name.Node_3121"

+            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

+         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

+         <param name="semanticHint" value="3121"/>

+      </specializationType>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Port_3069"

+               name="%metatype.name.Port_3069"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Port"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.PortEditHelper">

+            <param name="semanticHint" value="3069"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Parameter_3088"

+               name="%metatype.name.Parameter_3088"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Parameter"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ParameterEditHelper">

+            <param name="semanticHint" value="3088"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Property_3070"

+               name="%metatype.name.Property_3070"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Property"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.PropertyEditHelper">

+            <param name="semanticHint" value="3070"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.prototype.CollaborationRole_3115"

+               name="%metatype.name.ConnectableElement_3115"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="ConnectableElement"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.CollaborationRoleEditHelper">

+            <param name="semanticHint" value="3115"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.CollaborationUse_3071"

+               name="%metatype.name.CollaborationUse_3071"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="CollaborationUse"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.CollaborationUseEditHelper">

+            <param name="semanticHint" value="3071"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.Activity_3072"

+               name="%metatype.name.Activity_3072"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Activity_2060"/>

+            <param name="semanticHint" value="3072"/>

+         </specializationType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.Interaction_3073"

+               name="%metatype.name.Interaction_3073"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Interaction_2061"/>

+            <param name="semanticHint" value="3073"/>

+         </specializationType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_3074"

+               name="%metatype.name.ProtocolStateMachine_3074"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_2062"/>

+            <param name="semanticHint" value="3074"/>

+         </specializationType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.StateMachine_3075"

+               name="%metatype.name.StateMachine_3075"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.StateMachine_2063"/>

+            <param name="semanticHint" value="3075"/>

+         </specializationType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_3076"

+               name="%metatype.name.FunctionBehavior_3076"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_2064"/>

+            <param name="semanticHint" value="3076"/>

+         </specializationType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_3077"

+               name="%metatype.name.OpaqueBehavior_3077"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_2065"/>

+            <param name="semanticHint" value="3077"/>

+         </specializationType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.Component_3081"

+               name="%metatype.name.Component_3081"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Component_2069"/>

+            <param name="semanticHint" value="3081"/>

+         </specializationType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.Device_3082"

+               name="%metatype.name.Device_3082"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Device_2070"/>

+            <param name="semanticHint" value="3082"/>

+         </specializationType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_3083"

+               name="%metatype.name.ExecutionEnvironment_3083"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_2071"/>

+            <param name="semanticHint" value="3083"/>

+         </specializationType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.Node_3084"

+               name="%metatype.name.Node_3084"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Node_2072"/>

+            <param name="semanticHint" value="3084"/>

+         </specializationType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.Class_3085"

+               name="%metatype.name.Class_3085"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Class_2073"/>

+            <param name="semanticHint" value="3085"/>

+         </specializationType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Collaboration_3086"

+               name="%metatype.name.Collaboration_3086"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Collaboration"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.CollaborationEditHelper">

+            <param name="semanticHint" value="3086"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Interface_3087"

+               name="%metatype.name.Interface_3087"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Interface"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InterfaceEditHelper">

+            <param name="semanticHint" value="3087"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_3078"

+               name="%metatype.name.PrimitiveType_3078"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_2066"/>

+            <param name="semanticHint" value="3078"/>

+         </specializationType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.Enumeration_3079"

+               name="%metatype.name.Enumeration_3079"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.Enumeration_2067"/>

+            <param name="semanticHint" value="3079"/>

+         </specializationType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.DataType_3080"

+               name="%metatype.name.DataType_3080"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.papyrus.uml.diagram.composite.DataType_2068"/>

+            <param name="semanticHint" value="3080"/>

+         </specializationType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Actor_3091"

+               name="%metatype.name.Actor_3091"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Actor"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ActorEditHelper">

+            <param name="semanticHint" value="3091"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_3092"

+               name="%metatype.name.DeploymentSpecification_3092"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="DeploymentSpecification"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DeploymentSpecificationEditHelper">

+            <param name="semanticHint" value="3092"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Artifact_3093"

+               name="%metatype.name.Artifact_3093"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Artifact"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ArtifactEditHelper">

+            <param name="semanticHint" value="3093"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.InformationItem_3094"

+               name="%metatype.name.InformationItem_3094"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="InformationItem"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InformationItemEditHelper">

+            <param name="semanticHint" value="3094"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Signal_3095"

+               name="%metatype.name.Signal_3095"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Signal"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.SignalEditHelper">

+            <param name="semanticHint" value="3095"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.UseCase_3096"

+               name="%metatype.name.UseCase_3096"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="UseCase"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.UseCaseEditHelper">

+            <param name="semanticHint" value="3096"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Comment_3097"

+               name="%metatype.name.Comment_3097"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Comment"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.CommentEditHelper">

+            <param name="semanticHint" value="3097"/>

+         </metamodelType>

+      </metamodel>

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_3116"

+               name="%metatype.name.DurationConstraint_3116"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

+            <param name="semanticHint" value="3116"/>

+         </specializationType>

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_3117"

+               name="%metatype.name.TimeConstraint_3117"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

+            <param name="semanticHint" value="3117"/>

+         </specializationType>

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_3118"

+               name="%metatype.name.IntervalConstraint_3118"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

+            <param name="semanticHint" value="3118"/>

+         </specializationType>

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_3119"

+               name="%metatype.name.InteractionConstraint_3119"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

+            <param name="semanticHint" value="3119"/>

+         </specializationType>

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.Constraint_3120"

+               name="%metatype.name.Constraint_3120"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

+            <param name="semanticHint" value="3120"/>

+         </specializationType>

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.Property_3101"

+               name="%metatype.name.Property_3101"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

+            <param name="semanticHint" value="3101"/>

+         </specializationType>

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.Operation_3102"

+               name="%metatype.name.Operation_3102"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

+            <param name="semanticHint" value="3102"/>

+         </specializationType>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.EnumerationLiteral_3066"

+               name="%metatype.name.EnumerationLiteral_3066"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="EnumerationLiteral"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.EnumerationLiteralEditHelper">

+            <param name="semanticHint" value="3066"/>

+         </metamodelType>

+      </metamodel>

+      <specializationType

+            id="org.eclipse.papyrus.uml.diagram.composite.Link_4022"

+            name="%metatype.name.Link_4022"

+            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

+         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

+         <param name="semanticHint" value="4022"/>

+      </specializationType>

+      <specializationType

+            id="org.eclipse.papyrus.uml.diagram.composite.Link_4001"

+            name="%metatype.name.Link_4001"

+            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">

+         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

+         <param name="semanticHint" value="4001"/>

+      </specializationType>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.CommentAnnotatedElement_4002"

+               name="%metatype.name.CommentAnnotatedElement_4002"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

+            <param name="semanticHint" value="4002"/>

+         </specializationType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.ConstraintConstrainedElement_4003"

+               name="%metatype.name.ConstraintConstrainedElement_4003"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

+            <param name="semanticHint" value="4003"/>

+         </specializationType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.ComponentRealization_4004"

+               name="%metatype.name.ComponentRealization_4004"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="ComponentRealization"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ComponentRealizationEditHelper">

+            <param name="semanticHint" value="4004"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.InterfaceRealization_4005"

+               name="%metatype.name.InterfaceRealization_4005"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="InterfaceRealization"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InterfaceRealizationEditHelper">

+            <param name="semanticHint" value="4005"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Substitution_4011"

+               name="%metatype.name.Substitution_4011"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Substitution"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.SubstitutionEditHelper">

+            <param name="semanticHint" value="4011"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Realization_4006"

+               name="%metatype.name.Realization_4006"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Realization"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.RealizationEditHelper">

+            <param name="semanticHint" value="4006"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Manifestation_4012"

+               name="%metatype.name.Manifestation_4012"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Manifestation"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ManifestationEditHelper">

+            <param name="semanticHint" value="4012"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007"

+               name="%metatype.name.Abstraction_4007"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Abstraction"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.AbstractionEditHelper">

+            <param name="semanticHint" value="4007"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Usage_4008"

+               name="%metatype.name.Usage_4008"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Usage"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.UsageEditHelper">

+            <param name="semanticHint" value="4008"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Deployment_4009"

+               name="%metatype.name.Deployment_4009"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Deployment"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DeploymentEditHelper">

+            <param name="semanticHint" value="4009"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.RoleBinding_4017"

+               name="%metatype.name.Dependency_4017"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Dependency"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.RoleBindingEditHelper">

+            <param name="semanticHint" value="4017"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Dependency_4010"

+               name="%metatype.name.Dependency_4010"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Dependency"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.DependencyEditHelper">

+            <param name="semanticHint" value="4010"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Connector_4013"

+               name="%metatype.name.Connector_4013"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Connector"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.ConnectorEditHelper">

+            <param name="semanticHint" value="4013"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.Generalization_4015"

+               name="%metatype.name.Generalization_4015"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="Generalization"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.GeneralizationEditHelper">

+            <param name="semanticHint" value="4015"/>

+         </metamodelType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.TimeObservationEvent_4018"

+               name="%metatype.name.TimeObservationEvent_4018"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

+            <param name="semanticHint" value="4018"/>

+         </specializationType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.DurationObservationEvent_4019"

+               name="%metatype.name.DurationObservationEvent_4019"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

+            <param name="semanticHint" value="4019"/>

+         </specializationType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <specializationType

+               id="org.eclipse.papyrus.uml.diagram.composite.Representation_4020"

+               name="%metatype.name.InformationItemRepresented_4020"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">

+            <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>

+            <param name="semanticHint" value="4020"/>

+         </specializationType>

+      </metamodel>

+      <metamodel nsURI="http://www.eclipse.org/uml2/5.0.0/UML">

+         <metamodelType

+               id="org.eclipse.papyrus.uml.diagram.composite.InformationFlow_4021"

+               name="%metatype.name.InformationFlow_4021"

+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"

+               eclass="InformationFlow"

+               edithelper="org.eclipse.papyrus.uml.diagram.composite.edit.helpers.InformationFlowEditHelper">

+            <param name="semanticHint" value="4021"/>

+         </metamodelType>

+      </metamodel>

+   </extension>

+
+   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">

+      <?gmfgen generated="true"?>

+      <clientContext id="org.eclipse.papyrus.uml.diagram.composite.TypeContext">

+         <enablement>

+            <test

+               property="org.eclipse.gmf.runtime.emf.core.editingDomain"

+               value="org.eclipse.papyrus.uml.diagram.composite.EditingDomain"/>

+         </enablement>

+      </clientContext> 

+      <binding context="org.eclipse.papyrus.uml.diagram.composite.TypeContext">

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Package_1000"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Activity_2060"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interaction_2061"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_2062"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.StateMachine_2063"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_2064"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_2065"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Component_2069"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Device_2070"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_2071"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Node_2072"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Class_2073"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Collaboration_2075"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interface_2076"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_2066"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Enumeration_2067"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DataType_2068"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Actor_2077"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_2078"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Artifact_2079"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InformationItem_2080"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Signal_2081"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.UseCase_2082"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.SignalEvent_2083"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.CallEvent_2084"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.AnyReceiveEvent_2085"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ChangeEvent_2088"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeEvent_2089"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationObservation_2093"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeObservation_2094"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralBoolean_2095"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralInteger_2096"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralNull_2097"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralString_2098"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.LiteralUnlimitedNatural_2099"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.StringExpression_2100"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.OpaqueExpression_2101"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeExpression_2102"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Expression_2103"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Duration_2104"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeInterval_2105"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationInterval_2106"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interval_2107"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InstanceValue_2108"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Comment_2109"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_2110"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_2111"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_2112"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_2113"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Constraint_2114"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Node_3121"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Port_3069"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Parameter_3088"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Property_3070"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.prototype.CollaborationRole_3115"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.CollaborationUse_3071"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Activity_3072"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interaction_3073"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_3074"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.StateMachine_3075"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_3076"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_3077"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Component_3081"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Device_3082"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_3083"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Node_3084"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Class_3085"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Collaboration_3086"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Interface_3087"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_3078"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Enumeration_3079"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DataType_3080"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Actor_3091"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_3092"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Artifact_3093"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InformationItem_3094"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Signal_3095"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.UseCase_3096"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Comment_3097"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_3116"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_3117"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_3118"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_3119"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Constraint_3120"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Property_3101"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Operation_3102"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.EnumerationLiteral_3066"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Link_4022"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Link_4001"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.CommentAnnotatedElement_4002"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ConstraintConstrainedElement_4003"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.ComponentRealization_4004"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InterfaceRealization_4005"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Substitution_4011"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Realization_4006"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Manifestation_4012"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Usage_4008"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Deployment_4009"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.RoleBinding_4017"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Dependency_4010"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Connector_4013"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Generalization_4015"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.TimeObservationEvent_4018"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.DurationObservationEvent_4019"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.Representation_4020"/>

+         <elementType ref="org.eclipse.papyrus.uml.diagram.composite.InformationFlow_4021"/>

+         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>

+      </binding>

+   </extension>

 	   
 	   
 	   
       
-	      <extension point="org.eclipse.ui.commands" id="update-cmd">
-      <?gmfgen generated="true"?>
-      <command
-         categoryId="org.eclipse.ui.category.edit"
-         defaultHandler="org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramUpdateCommand"
-         description="%update.diagram.description"
-         id="org.eclipse.papyrus.uml.diagram.composite.updateDiagram"
-         name="%update.diagram.name"/>
-   </extension>
+	      <extension point="org.eclipse.ui.commands" id="update-cmd">

+      <?gmfgen generated="true"?>

+      <command

+         categoryId="org.eclipse.ui.category.edit"

+         defaultHandler="org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramUpdateCommand"

+         description="%update.diagram.description"

+         id="org.eclipse.papyrus.uml.diagram.composite.updateDiagram"

+         name="%update.diagram.name"/>

+   </extension>

    
-   <extension point="org.eclipse.ui.bindings" id="update-cmd-binding">
-      <?gmfgen generated="true"?>
-      <key 
-         commandId="org.eclipse.papyrus.uml.diagram.composite.updateDiagram"
-         contextId="org.eclipse.papyrus.uml.diagram.composite.ui.diagramContext"
-         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-         sequence="F5"/>
-   </extension>
+   <extension point="org.eclipse.ui.bindings" id="update-cmd-binding">

+      <?gmfgen generated="true"?>

+      <key 

+         commandId="org.eclipse.papyrus.uml.diagram.composite.updateDiagram"

+         contextId="org.eclipse.papyrus.uml.diagram.composite.ui.diagramContext"

+         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"

+         sequence="F5"/>

+   </extension>

    <extension
          point="org.eclipse.papyrus.infra.core.papyrusDiagram">
       <editorDiagram
@@ -1348,38 +1348,38 @@
             id="org.eclipse.papyrus.uml.diagram.composite.createCompositeDiagram"
             name="Create a new Composite Structure Diagram">
       </command>
-   </extension><extension point="org.eclipse.ui.menus" id="context-menus">
-      <?gmfgen generated="true"?>
-      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=">
-      </menuContribution>
-      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">
-      </menuContribution -->
-      <menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">
-         <command commandId="org.eclipse.papyrus.uml.diagram.composite.LoadResourceAction">
-            <visibleWhen>
-               <and>
-                  <with variable="activePartId"><equals value="org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorID"/></with>
-                  <with variable="selection"><iterate ifEmpty="false"> 
-                     <instanceof value="org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart"/>
-                  </iterate></with>
-               </and>
-            </visibleWhen>
-         </command>
-      </menuContribution>
-   </extension>
-
-<extension point="org.eclipse.ui.commands" id="menu-commands">
-      <?gmfgen generated="true"?>
-      <category id="org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/>
-      <command id="org.eclipse.papyrus.uml.diagram.composite.LoadResourceAction"
-         name="Load Resource"
-         categoryId="org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorID"
-         defaultHandler="org.eclipse.papyrus.uml.diagram.composite.part.LoadResourceAction"/>
-   </extension>
-
-<extension point="org.eclipse.ui.handlers" id="menu-handlers">
-      <?gmfgen generated="true"?>
-   </extension>
+   </extension><extension point="org.eclipse.ui.menus" id="context-menus">

+      <?gmfgen generated="true"?>

+      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=">

+      </menuContribution>

+      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=">

+      </menuContribution -->

+      <menuContribution locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">

+         <command commandId="org.eclipse.papyrus.uml.diagram.composite.LoadResourceAction">

+            <visibleWhen>

+               <and>

+                  <with variable="activePartId"><equals value="org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorID"/></with>

+                  <with variable="selection"><iterate ifEmpty="false"> 

+                     <instanceof value="org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart"/>

+                  </iterate></with>

+               </and>

+            </visibleWhen>

+         </command>

+      </menuContribution>

+   </extension>

+
+<extension point="org.eclipse.ui.commands" id="menu-commands">

+      <?gmfgen generated="true"?>

+      <category id="org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorID" name="%cmdcategory.name" description="%cmdcategory.desc"/>

+      <command id="org.eclipse.papyrus.uml.diagram.composite.LoadResourceAction"

+         name="Load Resource"

+         categoryId="org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorID"

+         defaultHandler="org.eclipse.papyrus.uml.diagram.composite.part.LoadResourceAction"/>

+   </extension>

+
+<extension point="org.eclipse.ui.handlers" id="menu-handlers">

+      <?gmfgen generated="true"?>

+   </extension>

 
 
 <extension
@@ -1393,27 +1393,27 @@
    </command>
 </extension>
 
-<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">
-				      <?gmfgen generated="true"?>
-				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLMarkerNavigationProvider">
-				         <MarkerType name="org.eclipse.papyrus.uml.diagram.composite.diagnostic"/>
-				         <Priority name="Lowest"/>
-				      </MarkerNavigationProvider>
-				   </extension>
-
-<extension id="diagnostic" name="Papyrus Composite Structure Diagram (Incubation) problems" point="org.eclipse.core.resources.markers">
-				      <?gmfgen generated="true"?>
-				      <super type="org.eclipse.core.resources.problemmarker"/>
-				      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>
-				      <persistent value="true"/>
-				   </extension><extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
-				      <?gmfgen generated="true"?>
-				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLValidationDecoratorProvider">
-				         <Priority name="Lowest"/>
-				         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>
-				         <context decoratorTargets="PRIMARY_VIEW"/>
-				      </decoratorProvider>
-				   </extension>
+<extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">

+				      <?gmfgen generated="true"?>

+				      <MarkerNavigationProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLMarkerNavigationProvider">

+				         <MarkerType name="org.eclipse.papyrus.uml.diagram.composite.diagnostic"/>

+				         <Priority name="Lowest"/>

+				      </MarkerNavigationProvider>

+				   </extension>

+
+<extension id="diagnostic" name="Papyrus Composite Structure Diagram (Incubation) problems" point="org.eclipse.core.resources.markers">

+				      <?gmfgen generated="true"?>

+				      <super type="org.eclipse.core.resources.problemmarker"/>

+				      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>

+				      <persistent value="true"/>

+				   </extension><extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">

+				      <?gmfgen generated="true"?>

+				      <decoratorProvider class="org.eclipse.papyrus.uml.diagram.composite.providers.UMLValidationDecoratorProvider">

+				         <Priority name="Lowest"/>

+				         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>

+				         <context decoratorTargets="PRIMARY_VIEW"/>

+				      </decoratorProvider>

+				   </extension>

    
 <!-- Diagram specific advices -->
 <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
@@ -1564,475 +1564,475 @@
 
 
 
-<extension
-			id="Papyrus Composite Structure Diagram (Incubation).palettedefinition"
-			name="Papyrus Composite Structure Diagram (Incubation) Predefined Entries"
-			point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
-			
-			<?gmfgen generated="true"?>	
-			<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
-				<Priority name="Lowest"/>
-				   		<contribution
-				   		    	factoryClass="org.eclipse.papyrus.uml.diagram.composite.part.UMLPaletteFactory">
-				   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
-				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
-				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
-				
-				<entry
-				      defineOnly="true"
-				      description="Create new Class"
-				      id="composite.tool.class"
-				      kind="tool"
-				      label="Class"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Property"
-				      id="composite.tool.property"
-				      kind="tool"
-				      label="Property"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Port"
-				      id="composite.tool.port"
-				      kind="tool"
-				      label="Port"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Collaboration"
-				      id="composite.tool.collaboration"
-				      kind="tool"
-				      label="Collaboration"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new CollaborationRole"
-				      id="composite.tool.collaborationrole"
-				      kind="tool"
-				      label="CollaborationRole"
-				      large_icon="icons/obj16/CollaborationRole.gif"
-				      path=""
-				      small_icon="icons/obj16/CollaborationRole.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new CollaborationUse"
-				      id="composite.tool.collaborationuse"
-				      kind="tool"
-				      label="CollaborationUse"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CollaborationUse.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CollaborationUse.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Comment"
-				      id="composite.tool.comment"
-				      kind="tool"
-				      label="Comment"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Constraint"
-				      id="composite.tool.constraint"
-				      kind="tool"
-				      label="Constraint"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new TimeObservation"
-				      id="composite.tool.timeobservation"
-				      kind="tool"
-				      label="TimeObservation"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new DurationObservation"
-				      id="composite.tool.durationobservation"
-				      kind="tool"
-				      label="DurationObservation"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new InformationItem"
-				      id="composite.tool.informationitem"
-				      kind="tool"
-				      label="InformationItem"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Parameter"
-				      id="composite.tool.parameter"
-				      kind="tool"
-				      label="Parameter"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Parameter.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Parameter.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Activity"
-				      id="composite.tool.activity"
-				      kind="tool"
-				      label="Activity"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Interaction"
-				      id="composite.tool.interaction"
-				      kind="tool"
-				      label="Interaction"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interaction.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interaction.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new ProtocolStateMachine"
-				      id="composite.tool.protocolstatemachine"
-				      kind="tool"
-				      label="ProtocolStateMachine"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProtocolStateMachine.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProtocolStateMachine.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new StateMachine"
-				      id="composite.tool.statemachine"
-				      kind="tool"
-				      label="StateMachine"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateMachine.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateMachine.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new FunctionBehavior"
-				      id="composite.tool.functionbehavior"
-				      kind="tool"
-				      label="FunctionBehavior"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FunctionBehavior.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FunctionBehavior.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new OpaqueBehavior"
-				      id="composite.tool.opaquebehavior"
-				      kind="tool"
-				      label="OpaqueBehavior"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueBehavior.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueBehavior.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Link (Comment / Constraint)"
-				      id="composite.tool.link"
-				      kind="tool"
-				      label="Link"
-				      large_icon="icons/obj16/Link.gif"
-				      path=""
-				      small_icon="icons/obj16/Link.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Connector"
-				      id="composite.tool.connector"
-				      kind="tool"
-				      label="Connector"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new RoleBinding"
-				      id="composite.tool.rolebinding"
-				      kind="tool"
-				      label="RoleBinding"
-				      large_icon="icons/obj16/CollaborationRoleBinding.gif"
-				      path=""
-				      small_icon="icons/obj16/CollaborationRoleBinding.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Generalization"
-				      id="composite.tool.generalization"
-				      kind="tool"
-				      label="Generalization"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Realization"
-				      id="composite.tool.realization"
-				      kind="tool"
-				      label="Realization"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Substitution"
-				      id="composite.tool.substitution"
-				      kind="tool"
-				      label="Substitution"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Abstraction"
-				      id="composite.tool.abstraction"
-				      kind="tool"
-				      label="Abstraction"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Usage"
-				      id="composite.tool.usage"
-				      kind="tool"
-				      label="Usage"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new Dependency"
-				      id="composite.tool.dependency"
-				      kind="tool"
-				      label="Dependency"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new representation for an InformationItem"
-				      id="composite.tool.representation"
-				      kind="tool"
-				      label="Representation"
-				      large_icon="icons/obj16/Representation.gif"
-				      path=""
-				      small_icon="icons/obj16/Representation.gif">
-					</entry>
-				<entry
-				      defineOnly="true"
-				      description="Create new InformationFlow"
-				      id="composite.tool.informationflow"
-				      kind="tool"
-				      label="InformationFlow"
-				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif"
-				      path=""
-				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif">
-					</entry>
-				
-				</contribution>
-			</paletteProvider>	
-				
-		</extension>
-
-<extension
-	id="Papyrus Composite Structure Diagram (Incubation).standard"
-	name="Papyrus Composite Structure Diagram (Incubation) Standard Palette"
-	point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 
-	
-	<?gmfgen generated="true"?>	
-	<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
-		<Priority name="Low"/>
-		   		<contribution
-		   		    	factoryClass="org.eclipse.papyrus.uml.diagram.composite.part.UMLPaletteFactory">
-		   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 
-		<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 
-		<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>
-		
-		<entry
-		      description="Nodes"
-		      id="composite.group.nodes"
-		      kind="drawer"
-		      label="Nodes"
-		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-		      path="/"
-		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
-		      <expand
-		             force="true">
-		      </expand>
-			</entry>
-		<predefinedEntry
-		        id="composite.tool.class"
-		        path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.property"
-		        path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.port"
-		        path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.collaboration"
-		        path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.collaborationrole"
-		        path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.collaborationuse"
-		        path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.comment"
-		        path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.constraint"
-		        path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.timeobservation"
-		        path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.durationobservation"
-		        path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.informationitem"
-		        path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.parameter"
-		        path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.activity"
-		        path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.interaction"
-		        path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.protocolstatemachine"
-		        path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.statemachine"
-		        path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.functionbehavior"
-		        path="/composite.group.nodes">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.opaquebehavior"
-		        path="/composite.group.nodes">
-		  </predefinedEntry>
-		<entry
-		      description="Edges"
-		      id="composite.group.edges"
-		      kind="drawer"
-		      label="Edges"
-		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
-		      path="/"
-		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">
-		      <expand
-		             force="true">
-		      </expand>
-			</entry>
-		<predefinedEntry
-		        id="composite.tool.link"
-		        path="/composite.group.edges">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.connector"
-		        path="/composite.group.edges">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.rolebinding"
-		        path="/composite.group.edges">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.generalization"
-		        path="/composite.group.edges">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.realization"
-		        path="/composite.group.edges">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.substitution"
-		        path="/composite.group.edges">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.abstraction"
-		        path="/composite.group.edges">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.usage"
-		        path="/composite.group.edges">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.dependency"
-		        path="/composite.group.edges">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.representation"
-		        path="/composite.group.edges">
-		  </predefinedEntry>
-		<predefinedEntry
-		        id="composite.tool.informationflow"
-		        path="/composite.group.edges">
-		  </predefinedEntry>
-		</contribution>
-		<editor id="org.eclipse.papyrus.uml.diagram.composite"/>
-	</paletteProvider>	
-		
-</extension>
+<extension

+			id="Papyrus Composite Structure Diagram (Incubation).palettedefinition"

+			name="Papyrus Composite Structure Diagram (Incubation) Predefined Entries"

+			point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 

+			

+			<?gmfgen generated="true"?>	

+			<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

+				<Priority name="Lowest"/>

+				   		<contribution

+				   		    	factoryClass="org.eclipse.papyrus.uml.diagram.composite.part.UMLPaletteFactory">

+				   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

+				<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

+				<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

+				

+				<entry

+				      defineOnly="true"

+				      description="Create new Class"

+				      id="composite.tool.class"

+				      kind="tool"

+				      label="Class"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Class.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Property"

+				      id="composite.tool.property"

+				      kind="tool"

+				      label="Property"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Port"

+				      id="composite.tool.port"

+				      kind="tool"

+				      label="Port"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Collaboration"

+				      id="composite.tool.collaboration"

+				      kind="tool"

+				      label="Collaboration"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Collaboration.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new CollaborationRole"

+				      id="composite.tool.collaborationrole"

+				      kind="tool"

+				      label="CollaborationRole"

+				      large_icon="icons/obj16/CollaborationRole.gif"

+				      path=""

+				      small_icon="icons/obj16/CollaborationRole.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new CollaborationUse"

+				      id="composite.tool.collaborationuse"

+				      kind="tool"

+				      label="CollaborationUse"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CollaborationUse.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/CollaborationUse.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Comment"

+				      id="composite.tool.comment"

+				      kind="tool"

+				      label="Comment"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Constraint"

+				      id="composite.tool.constraint"

+				      kind="tool"

+				      label="Constraint"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new TimeObservation"

+				      id="composite.tool.timeobservation"

+				      kind="tool"

+				      label="TimeObservation"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/TimeObservation.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new DurationObservation"

+				      id="composite.tool.durationobservation"

+				      kind="tool"

+				      label="DurationObservation"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DurationObservation.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new InformationItem"

+				      id="composite.tool.informationitem"

+				      kind="tool"

+				      label="InformationItem"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationItem.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Parameter"

+				      id="composite.tool.parameter"

+				      kind="tool"

+				      label="Parameter"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Parameter.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Parameter.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Activity"

+				      id="composite.tool.activity"

+				      kind="tool"

+				      label="Activity"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Activity.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Interaction"

+				      id="composite.tool.interaction"

+				      kind="tool"

+				      label="Interaction"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interaction.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interaction.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new ProtocolStateMachine"

+				      id="composite.tool.protocolstatemachine"

+				      kind="tool"

+				      label="ProtocolStateMachine"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProtocolStateMachine.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/ProtocolStateMachine.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new StateMachine"

+				      id="composite.tool.statemachine"

+				      kind="tool"

+				      label="StateMachine"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateMachine.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/StateMachine.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new FunctionBehavior"

+				      id="composite.tool.functionbehavior"

+				      kind="tool"

+				      label="FunctionBehavior"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FunctionBehavior.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/FunctionBehavior.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new OpaqueBehavior"

+				      id="composite.tool.opaquebehavior"

+				      kind="tool"

+				      label="OpaqueBehavior"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueBehavior.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/OpaqueBehavior.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Link (Comment / Constraint)"

+				      id="composite.tool.link"

+				      kind="tool"

+				      label="Link"

+				      large_icon="icons/obj16/Link.gif"

+				      path=""

+				      small_icon="icons/obj16/Link.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Connector"

+				      id="composite.tool.connector"

+				      kind="tool"

+				      label="Connector"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new RoleBinding"

+				      id="composite.tool.rolebinding"

+				      kind="tool"

+				      label="RoleBinding"

+				      large_icon="icons/obj16/CollaborationRoleBinding.gif"

+				      path=""

+				      small_icon="icons/obj16/CollaborationRoleBinding.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Generalization"

+				      id="composite.tool.generalization"

+				      kind="tool"

+				      label="Generalization"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Realization"

+				      id="composite.tool.realization"

+				      kind="tool"

+				      label="Realization"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Realization.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Substitution"

+				      id="composite.tool.substitution"

+				      kind="tool"

+				      label="Substitution"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Substitution.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Abstraction"

+				      id="composite.tool.abstraction"

+				      kind="tool"

+				      label="Abstraction"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Abstraction.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Usage"

+				      id="composite.tool.usage"

+				      kind="tool"

+				      label="Usage"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new Dependency"

+				      id="composite.tool.dependency"

+				      kind="tool"

+				      label="Dependency"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new representation for an InformationItem"

+				      id="composite.tool.representation"

+				      kind="tool"

+				      label="Representation"

+				      large_icon="icons/obj16/Representation.gif"

+				      path=""

+				      small_icon="icons/obj16/Representation.gif">

+					</entry>

+				<entry

+				      defineOnly="true"

+				      description="Create new InformationFlow"

+				      id="composite.tool.informationflow"

+				      kind="tool"

+				      label="InformationFlow"

+				      large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif"

+				      path=""

+				      small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InformationFlow.gif">

+					</entry>

+				

+				</contribution>

+			</paletteProvider>	

+				

+		</extension>

+
+<extension

+	id="Papyrus Composite Structure Diagram (Incubation).standard"

+	name="Papyrus Composite Structure Diagram (Incubation) Standard Palette"

+	point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"> 

+	

+	<?gmfgen generated="true"?>	

+	<paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">

+		<Priority name="Low"/>

+		   		<contribution

+		   		    	factoryClass="org.eclipse.papyrus.uml.diagram.composite.part.UMLPaletteFactory">

+		   		<predefinedEntry id="standardGroup/noteStack/noteTool" remove="true"/> 

+		<predefinedEntry id="standardGroup/noteStack/textTool" remove="true"/> 

+		<predefinedEntry id="standardGroup/noteStack/noteattachmentTool" remove="true"/>

+		

+		<entry

+		      description="Nodes"

+		      id="composite.group.nodes"

+		      kind="drawer"

+		      label="Nodes"

+		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

+		      path="/"

+		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

+		      <expand

+		             force="true">

+		      </expand>

+			</entry>

+		<predefinedEntry

+		        id="composite.tool.class"

+		        path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.property"

+		        path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.port"

+		        path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.collaboration"

+		        path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.collaborationrole"

+		        path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.collaborationuse"

+		        path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.comment"

+		        path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.constraint"

+		        path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.timeobservation"

+		        path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.durationobservation"

+		        path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.informationitem"

+		        path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.parameter"

+		        path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.activity"

+		        path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.interaction"

+		        path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.protocolstatemachine"

+		        path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.statemachine"

+		        path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.functionbehavior"

+		        path="/composite.group.nodes">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.opaquebehavior"

+		        path="/composite.group.nodes">

+		  </predefinedEntry>

+		<entry

+		      description="Edges"

+		      id="composite.group.edges"

+		      kind="drawer"

+		      label="Edges"

+		      large_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"

+		      path="/"

+		      small_icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif">

+		      <expand

+		             force="true">

+		      </expand>

+			</entry>

+		<predefinedEntry

+		        id="composite.tool.link"

+		        path="/composite.group.edges">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.connector"

+		        path="/composite.group.edges">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.rolebinding"

+		        path="/composite.group.edges">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.generalization"

+		        path="/composite.group.edges">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.realization"

+		        path="/composite.group.edges">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.substitution"

+		        path="/composite.group.edges">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.abstraction"

+		        path="/composite.group.edges">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.usage"

+		        path="/composite.group.edges">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.dependency"

+		        path="/composite.group.edges">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.representation"

+		        path="/composite.group.edges">

+		  </predefinedEntry>

+		<predefinedEntry

+		        id="composite.tool.informationflow"

+		        path="/composite.group.edges">

+		  </predefinedEntry>

+		</contribution>

+		<editor id="org.eclipse.papyrus.uml.diagram.composite"/>

+	</paletteProvider>	

+		

+</extension>

 
 <extension point="org.eclipse.papyrus.infra.gmfdiag.common.notationTypesMapping">
 		<diagramMappings diagramID="CompositeStructure">
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AbstractionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AbstractionCreateCommand.java
index b78e408fe93..ea1f91484a0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AbstractionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AbstractionCreateCommand.java
@@ -1,162 +1,165 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Abstraction;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-
-/**
- * @generated
- */
-public class AbstractionCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	protected final EObject source;
-	/**
-	 * @generated
-	 */
-	protected final EObject target;
-	/**
-	 * @generated
-	 */
-	protected Package container;
-
-	/**
-	 * @generated
-	 */
-	public AbstractionCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
-		super(request.getLabel(), null, request);
-		this.source = source;
-		this.target = target;
-		container = deduceContainer(source, target);
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (source == null && target == null) {
-			return false;
-		}
-		if (source != null && false == source instanceof NamedElement) {
-			return false;
-		}
-		if (target != null && false == target instanceof NamedElement) {
-			return false;
-		}
-		if (getSource() == null) {
-			return true; // link creation is in progress; source is not defined yet
-		}
-		// target may be null here but it's possible to check constraint
-		if (getContainer() == null) {
-			return false;
-		}
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateAbstraction_4007(getContainer(), getSource(), getTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
-		}
-		Abstraction newElement = UMLFactory.eINSTANCE.createAbstraction();
-		getContainer().getPackagedElements()
-				.add(newElement);
-		newElement.getClients()
-				.add(getSource());
-		newElement.getSuppliers()
-				.add(getTarget());
-		ElementInitializers.getInstance().init_Abstraction_4007(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Abstraction newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());
-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setElementToEdit(EObject element) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getSource() {
-		return (NamedElement) source;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getTarget() {
-		return (NamedElement) target;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Package getContainer() {
-		return container;
-	}
-
-	/**
-	 * Default approach is to traverse ancestors of the source to find instance of container.
-	 * Modify with appropriate logic.
-	 * @generated
-	 */
-	protected Package deduceContainer(EObject source, EObject target) {
-		// Find container element for the new link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				return (Package) element;
-			}
-		}
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Abstraction;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+

+/**

+ * @generated

+ */

+public class AbstractionCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	protected final EObject source;

+

+	/**

+	 * @generated

+	 */

+	protected final EObject target;

+

+	/**

+	 * @generated

+	 */

+	protected Package container;

+

+	/**

+	 * @generated

+	 */

+	public AbstractionCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

+		super(request.getLabel(), null, request);

+		this.source = source;

+		this.target = target;

+		container = deduceContainer(source, target);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(source == null && target == null) {

+			return false;

+		}

+		if(source != null && false == source instanceof NamedElement) {

+			return false;

+		}

+		if(target != null && false == target instanceof NamedElement) {

+			return false;

+		}

+		if(getSource() == null) {

+			return true; // link creation is in progress; source is not defined yet

+		}

+		// target may be null here but it's possible to check constraint

+		if(getContainer() == null) {

+			return false;

+		}

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateAbstraction_4007(getContainer(), getSource(), getTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

+		}

+

+		Abstraction newElement = UMLFactory.eINSTANCE.createAbstraction();

+		getContainer().getPackagedElements().add(newElement);

+		newElement.getClients().add(getSource());

+		newElement.getSuppliers().add(getTarget());

+		ElementInitializers.getInstance().init_Abstraction_4007(newElement);

+		doConfigure(newElement, monitor, info);

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Abstraction newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

+		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setElementToEdit(EObject element) {

+		throw new UnsupportedOperationException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getSource() {

+		return (NamedElement)source;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getTarget() {

+		return (NamedElement)target;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Package getContainer() {

+		return container;

+	}

+

+	/**

+	 * Default approach is to traverse ancestors of the source to find instance of container.

+	 * Modify with appropriate logic.

+	 * 

+	 * @generated

+	 */

+	protected Package deduceContainer(EObject source, EObject target) {

+		// Find container element for the new link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				return (Package)element;

+			}

+		}

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AbstractionReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AbstractionReorientCommand.java
index 2f45db7ab66..6ef2c48bee6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AbstractionReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AbstractionReorientCommand.java
@@ -1,183 +1,176 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.uml2.uml.Abstraction;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-
-/**
- * @generated
- */
-public class AbstractionReorientCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private final int reorientDirection;
-	/**
-	 * @generated
-	 */
-	private final EObject oldEnd;
-	/**
-	 * @generated
-	 */
-	private final EObject newEnd;
-
-	/**
-	 * @generated
-	 */
-	public AbstractionReorientCommand(ReorientRelationshipRequest request) {
-		super(request.getLabel(), request.getRelationship(), request);
-		reorientDirection = request.getDirection();
-		oldEnd = request.getOldRelationshipEnd();
-		newEnd = request.getNewRelationshipEnd();
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (false == getElementToEdit() instanceof Abstraction) {
-			return false;
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return canReorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return canReorientTarget();
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientSource() {
-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
-			return false;
-		}
-		if (getLink().getSuppliers()
-				.size() != 1) {
-			return false;
-		}
-		NamedElement target = (NamedElement) getLink().getSuppliers()
-				.get(0);
-		if (!(getLink().eContainer() instanceof Package)) {
-			return false;
-		}
-		Package container = (Package) getLink().eContainer();
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistAbstraction_4007(container, getLink(), getNewSource(), target);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientTarget() {
-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
-			return false;
-		}
-		if (getLink().getClients()
-				.size() != 1) {
-			return false;
-		}
-		NamedElement source = (NamedElement) getLink().getClients()
-				.get(0);
-		if (!(getLink().eContainer() instanceof Package)) {
-			return false;
-		}
-		Package container = (Package) getLink().eContainer();
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistAbstraction_4007(container, getLink(), source, getNewTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(
-			IProgressMonitor monitor, IAdaptable info)
-			throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return reorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return reorientTarget();
-		}
-		throw new IllegalStateException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientSource() throws ExecutionException {
-		getLink().getClients()
-				.remove(getOldSource());
-		getLink().getClients()
-				.add(getNewSource());
-		return CommandResult.newOKCommandResult(getLink());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientTarget() throws ExecutionException {
-		getLink().getSuppliers()
-				.remove(getOldTarget());
-		getLink().getSuppliers()
-				.add(getNewTarget());
-		return CommandResult.newOKCommandResult(getLink());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Abstraction getLink() {
-		return (Abstraction) getElementToEdit();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getOldSource() {
-		return (NamedElement) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getNewSource() {
-		return (NamedElement) newEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getOldTarget() {
-		return (NamedElement) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getNewTarget() {
-		return (NamedElement) newEnd;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.uml2.uml.Abstraction;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Package;

+

+/**

+ * @generated

+ */

+public class AbstractionReorientCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private final int reorientDirection;

+

+	/**

+	 * @generated

+	 */

+	private final EObject oldEnd;

+

+	/**

+	 * @generated

+	 */

+	private final EObject newEnd;

+

+	/**

+	 * @generated

+	 */

+	public AbstractionReorientCommand(ReorientRelationshipRequest request) {

+		super(request.getLabel(), request.getRelationship(), request);

+		reorientDirection = request.getDirection();

+		oldEnd = request.getOldRelationshipEnd();

+		newEnd = request.getNewRelationshipEnd();

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(false == getElementToEdit() instanceof Abstraction) {

+			return false;

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return canReorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return canReorientTarget();

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientSource() {

+		if(!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

+			return false;

+		}

+		if(getLink().getSuppliers().size() != 1) {

+			return false;

+		}

+		NamedElement target = (NamedElement)getLink().getSuppliers().get(0);

+		if(!(getLink().eContainer() instanceof Package)) {

+			return false;

+		}

+		Package container = (Package)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistAbstraction_4007(container, getLink(), getNewSource(), target);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientTarget() {

+		if(!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

+			return false;

+		}

+		if(getLink().getClients().size() != 1) {

+			return false;

+		}

+		NamedElement source = (NamedElement)getLink().getClients().get(0);

+		if(!(getLink().eContainer() instanceof Package)) {

+			return false;

+		}

+		Package container = (Package)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistAbstraction_4007(container, getLink(), source, getNewTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return reorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return reorientTarget();

+		}

+		throw new IllegalStateException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientSource() throws ExecutionException {

+		getLink().getClients().remove(getOldSource());

+		getLink().getClients().add(getNewSource());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientTarget() throws ExecutionException {

+		getLink().getSuppliers().remove(getOldTarget());

+		getLink().getSuppliers().add(getNewTarget());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Abstraction getLink() {

+		return (Abstraction)getElementToEdit();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getOldSource() {

+		return (NamedElement)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getNewSource() {

+		return (NamedElement)newEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getOldTarget() {

+		return (NamedElement)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getNewTarget() {

+		return (NamedElement)newEnd;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActivityCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActivityCompositeCreateCommand.java
index fb86536343b..cca394865a3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActivityCompositeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActivityCompositeCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Activity;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class ActivityCompositeCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public ActivityCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getActivity());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Activity newElement = UMLFactory.eINSTANCE.createActivity();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Activity_2060(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Activity newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Activity;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class ActivityCompositeCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public ActivityCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getActivity());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Activity newElement = UMLFactory.eINSTANCE.createActivity();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Activity_2060(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Activity newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActivityCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActivityCompositeCreateCommandCN.java
index 6b4d156a751..9ab946fe1f0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActivityCompositeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActivityCompositeCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Activity;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class ActivityCompositeCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public ActivityCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getActivity());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Activity newElement = UMLFactory.eINSTANCE.createActivity();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Class qualifiedTarget = (Class) target;
-				qualifiedTarget.getNestedClassifiers()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Activity_3072(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Activity newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Activity;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class ActivityCompositeCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public ActivityCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getActivity());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Activity newElement = UMLFactory.eINSTANCE.createActivity();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Class qualifiedTarget = (Class)target;

+				qualifiedTarget.getNestedClassifiers().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Activity_3072(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Activity newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActorCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActorCreateCommand.java
index d54847be740..757daf4383b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActorCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActorCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Actor;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class ActorCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public ActorCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getActor());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Actor newElement = UMLFactory.eINSTANCE.createActor();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Actor_2077(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Actor newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Actor;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class ActorCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public ActorCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getActor());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Actor newElement = UMLFactory.eINSTANCE.createActor();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Actor_2077(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Actor newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActorCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActorCreateCommandCN.java
index cdc31b16676..a583815ab31 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActorCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ActorCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Actor;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class ActorCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public ActorCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getActor());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Actor newElement = UMLFactory.eINSTANCE.createActor();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Class qualifiedTarget = (Class) target;
-				qualifiedTarget.getNestedClassifiers()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Actor_3091(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Actor newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Actor;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class ActorCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public ActorCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getActor());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Actor newElement = UMLFactory.eINSTANCE.createActor();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Class qualifiedTarget = (Class)target;

+				qualifiedTarget.getNestedClassifiers().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Actor_3091(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Actor newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AnyReceiveEventCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AnyReceiveEventCreateCommand.java
index f527c89cd01..7bb1ca9da28 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AnyReceiveEventCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/AnyReceiveEventCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.AnyReceiveEvent;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class AnyReceiveEventCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public AnyReceiveEventCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getAnyReceiveEvent());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		AnyReceiveEvent newElement = UMLFactory.eINSTANCE.createAnyReceiveEvent();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_AnyReceiveEvent_2085(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(AnyReceiveEvent newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.AnyReceiveEvent;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class AnyReceiveEventCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public AnyReceiveEventCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getAnyReceiveEvent());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		AnyReceiveEvent newElement = UMLFactory.eINSTANCE.createAnyReceiveEvent();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_AnyReceiveEvent_2085(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(AnyReceiveEvent newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ArtifactCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ArtifactCreateCommand.java
index 154fb48ccdc..6661c4b2a00 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ArtifactCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ArtifactCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Artifact;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class ArtifactCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public ArtifactCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getArtifact());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Artifact newElement = UMLFactory.eINSTANCE.createArtifact();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Artifact_2079(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Artifact newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Artifact;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class ArtifactCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public ArtifactCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getArtifact());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Artifact newElement = UMLFactory.eINSTANCE.createArtifact();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Artifact_2079(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Artifact newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ArtifactCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ArtifactCreateCommandCN.java
index fed88777898..a670b32d4f8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ArtifactCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ArtifactCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Artifact;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class ArtifactCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public ArtifactCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getArtifact());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Artifact newElement = UMLFactory.eINSTANCE.createArtifact();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Class qualifiedTarget = (Class) target;
-				qualifiedTarget.getNestedClassifiers()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Artifact_3093(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Artifact newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Artifact;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class ArtifactCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public ArtifactCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getArtifact());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Artifact newElement = UMLFactory.eINSTANCE.createArtifact();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Class qualifiedTarget = (Class)target;

+				qualifiedTarget.getNestedClassifiers().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Artifact_3093(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Artifact newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CallEventCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CallEventCreateCommand.java
index e85911d68b9..6fa4b16519f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CallEventCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CallEventCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.CallEvent;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class CallEventCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public CallEventCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getCallEvent());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		CallEvent newElement = UMLFactory.eINSTANCE.createCallEvent();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_CallEvent_2084(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(CallEvent newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.CallEvent;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class CallEventCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public CallEventCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getCallEvent());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		CallEvent newElement = UMLFactory.eINSTANCE.createCallEvent();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_CallEvent_2084(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(CallEvent newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ChangeEventCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ChangeEventCreateCommand.java
index a43aeeb8c3a..f0d9ff197a3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ChangeEventCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ChangeEventCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.ChangeEvent;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class ChangeEventCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public ChangeEventCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getChangeEvent());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		ChangeEvent newElement = UMLFactory.eINSTANCE.createChangeEvent();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_ChangeEvent_2088(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(ChangeEvent newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.ChangeEvent;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class ChangeEventCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public ChangeEventCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getChangeEvent());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		ChangeEvent newElement = UMLFactory.eINSTANCE.createChangeEvent();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_ChangeEvent_2088(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(ChangeEvent newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ClassCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ClassCompositeCreateCommand.java
index cefe6bbcf40..5427e786543 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ClassCompositeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ClassCompositeCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class ClassCompositeCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public ClassCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getClass_());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Class newElement = UMLFactory.eINSTANCE.createClass();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Class_2073(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Class newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class ClassCompositeCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public ClassCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getClass_());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Class newElement = UMLFactory.eINSTANCE.createClass();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Class_2073(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Class newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ClassCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ClassCompositeCreateCommandCN.java
index 473d3536ce7..d13f942b4c3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ClassCompositeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ClassCompositeCreateCommandCN.java
@@ -1,109 +1,121 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class ClassCompositeCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public ClassCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getClass_());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Class newElement = UMLFactory.eINSTANCE.createClass();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Class qualifiedTarget = (Class) target;
-				qualifiedTarget.getNestedClassifiers()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Class_3085(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Class newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class ClassCompositeCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public ClassCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getClass_());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Class newElement = UMLFactory.eINSTANCE.createClass();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Class qualifiedTarget = (Class)target;

+				qualifiedTarget.getNestedClassifiers().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Class_3085(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Class newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationCompositeCreateCommand.java
index be27a9a5b77..33004200690 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationCompositeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationCompositeCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Collaboration;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class CollaborationCompositeCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public CollaborationCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getCollaboration());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Collaboration newElement = UMLFactory.eINSTANCE.createCollaboration();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Collaboration_2075(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Collaboration newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Collaboration;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class CollaborationCompositeCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public CollaborationCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getCollaboration());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Collaboration newElement = UMLFactory.eINSTANCE.createCollaboration();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Collaboration_2075(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Collaboration newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationCompositeCreateCommandCN.java
index c366074450b..a0c7a8cdf19 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationCompositeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationCompositeCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Collaboration;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class CollaborationCompositeCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public CollaborationCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getCollaboration());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Collaboration newElement = UMLFactory.eINSTANCE.createCollaboration();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Class qualifiedTarget = (Class) target;
-				qualifiedTarget.getNestedClassifiers()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Collaboration_3086(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Collaboration newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.Collaboration;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class CollaborationCompositeCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public CollaborationCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getCollaboration());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Collaboration newElement = UMLFactory.eINSTANCE.createCollaboration();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Class qualifiedTarget = (Class)target;

+				qualifiedTarget.getNestedClassifiers().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Collaboration_3086(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Collaboration newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationRoleCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationRoleCreateCommandCN.java
index fdebf79da3c..fb89e8b8c8c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationRoleCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationRoleCreateCommandCN.java
@@ -1,89 +1,95 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.uml2.uml.ConnectableElement;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class CollaborationRoleCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public CollaborationRoleCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getConnectableElement());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		throw new UnsupportedOperationException("Unimplemented operation (abstract domain element).");
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(ConnectableElement newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.uml2.uml.ConnectableElement;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class CollaborationRoleCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public CollaborationRoleCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getConnectableElement());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		throw new UnsupportedOperationException("Unimplemented operation (abstract domain element).");

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(ConnectableElement newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationUseCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationUseCreateCommandCN.java
index 261f1b97e72..c5a04101f5f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationUseCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CollaborationUseCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Classifier;
-import org.eclipse.uml2.uml.CollaborationUse;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class CollaborationUseCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public CollaborationUseCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getCollaborationUse());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		CollaborationUse newElement = UMLFactory.eINSTANCE.createCollaborationUse();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Classifier qualifiedTarget = (Classifier) target;
-				qualifiedTarget.getCollaborationUses()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_CollaborationUse_3071(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(CollaborationUse newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Classifier;

+import org.eclipse.uml2.uml.CollaborationUse;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class CollaborationUseCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public CollaborationUseCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getCollaborationUse());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		CollaborationUse newElement = UMLFactory.eINSTANCE.createCollaborationUse();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Classifier qualifiedTarget = (Classifier)target;

+				qualifiedTarget.getCollaborationUses().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_CollaborationUse_3071(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(CollaborationUse newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentAnnotatedElementCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentAnnotatedElementCreateCommand.java
index f05d66ff0c0..5ce81013f4e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentAnnotatedElementCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentAnnotatedElementCreateCommand.java
@@ -1,101 +1,104 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.uml2.uml.Element;
-
-/**
- * @generated
- */
-public class CommentAnnotatedElementCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	protected final EObject source;
-	/**
-	 * @generated
-	 */
-	protected final EObject target;
-
-	/**
-	 * @generated
-	 */
-	public CommentAnnotatedElementCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
-		super(request.getLabel(), null, request);
-		this.source = source;
-		this.target = target;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (source == null && target == null) {
-			return false;
-		}
-		if (source != null && false == source instanceof Comment) {
-			return false;
-		}
-		if (target != null && false == target instanceof Element) {
-			return false;
-		}
-		if (getSource() == null) {
-			return true; // link creation is in progress; source is not defined yet
-		}
-		// target may be null here but it's possible to check constraint
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateCommentAnnotatedElement_4002(getSource(), getTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
-		}
-		if (getSource() != null && getTarget() != null) {
-			getSource().getAnnotatedElements()
-					.add(getTarget());
-		}
-		return CommandResult.newOKCommandResult();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setElementToEdit(EObject element) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Comment getSource() {
-		return (Comment) source;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Element getTarget() {
-		return (Element) target;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.uml2.uml.Comment;

+import org.eclipse.uml2.uml.Element;

+

+/**

+ * @generated

+ */

+public class CommentAnnotatedElementCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	protected final EObject source;

+

+	/**

+	 * @generated

+	 */

+	protected final EObject target;

+

+	/**

+	 * @generated

+	 */

+	public CommentAnnotatedElementCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

+		super(request.getLabel(), null, request);

+		this.source = source;

+		this.target = target;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(source == null && target == null) {

+			return false;

+		}

+		if(source != null && false == source instanceof Comment) {

+			return false;

+		}

+		if(target != null && false == target instanceof Element) {

+			return false;

+		}

+		if(getSource() == null) {

+			return true; // link creation is in progress; source is not defined yet

+		}

+		// target may be null here but it's possible to check constraint

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateCommentAnnotatedElement_4002(getSource(), getTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

+		}

+

+		if(getSource() != null && getTarget() != null) {

+			getSource().getAnnotatedElements().add(getTarget());

+		}

+		return CommandResult.newOKCommandResult();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setElementToEdit(EObject element) {

+		throw new UnsupportedOperationException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Comment getSource() {

+		return (Comment)source;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Element getTarget() {

+		return (Element)target;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentAnnotatedElementReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentAnnotatedElementReorientCommand.java
index 2775cc93bf1..68312d22a93 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentAnnotatedElementReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentAnnotatedElementReorientCommand.java
@@ -1,161 +1,159 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.uml2.uml.Element;
-
-/**
- * @generated
- */
-public class CommentAnnotatedElementReorientCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private final int reorientDirection;
-	/**
-	 * @generated
-	 */
-	private final EObject referenceOwner;
-	/**
-	 * @generated
-	 */
-	private final EObject oldEnd;
-	/**
-	 * @generated
-	 */
-	private final EObject newEnd;
-
-	/**
-	 * @generated
-	 */
-	public CommentAnnotatedElementReorientCommand(ReorientReferenceRelationshipRequest request) {
-		super(request.getLabel(), null, request);
-		reorientDirection = request.getDirection();
-		referenceOwner = request.getReferenceOwner();
-		oldEnd = request.getOldRelationshipEnd();
-		newEnd = request.getNewRelationshipEnd();
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (false == referenceOwner instanceof Comment) {
-			return false;
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return canReorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return canReorientTarget();
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientSource() {
-		if (!(oldEnd instanceof Element && newEnd instanceof Comment)) {
-			return false;
-		}
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistCommentAnnotatedElement_4002(getNewSource(), getOldTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientTarget() {
-		if (!(oldEnd instanceof Element && newEnd instanceof Element)) {
-			return false;
-		}
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistCommentAnnotatedElement_4002(getOldSource(), getNewTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(
-			IProgressMonitor monitor, IAdaptable info)
-			throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return reorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return reorientTarget();
-		}
-		throw new IllegalStateException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientSource() throws ExecutionException {
-		getOldSource().getAnnotatedElements()
-				.remove(getOldTarget());
-		getNewSource().getAnnotatedElements()
-				.add(getOldTarget());
-		return CommandResult.newOKCommandResult(referenceOwner);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientTarget() throws ExecutionException {
-		getOldSource().getAnnotatedElements()
-				.remove(getOldTarget());
-		getOldSource().getAnnotatedElements()
-				.add(getNewTarget());
-		return CommandResult.newOKCommandResult(referenceOwner);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Comment getOldSource() {
-		return (Comment) referenceOwner;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Comment getNewSource() {
-		return (Comment) newEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Element getOldTarget() {
-		return (Element) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Element getNewTarget() {
-		return (Element) newEnd;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.uml2.uml.Comment;

+import org.eclipse.uml2.uml.Element;

+

+/**

+ * @generated

+ */

+public class CommentAnnotatedElementReorientCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private final int reorientDirection;

+

+	/**

+	 * @generated

+	 */

+	private final EObject referenceOwner;

+

+	/**

+	 * @generated

+	 */

+	private final EObject oldEnd;

+

+	/**

+	 * @generated

+	 */

+	private final EObject newEnd;

+

+	/**

+	 * @generated

+	 */

+	public CommentAnnotatedElementReorientCommand(ReorientReferenceRelationshipRequest request) {

+		super(request.getLabel(), null, request);

+		reorientDirection = request.getDirection();

+		referenceOwner = request.getReferenceOwner();

+		oldEnd = request.getOldRelationshipEnd();

+		newEnd = request.getNewRelationshipEnd();

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(false == referenceOwner instanceof Comment) {

+			return false;

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return canReorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return canReorientTarget();

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientSource() {

+		if(!(oldEnd instanceof Element && newEnd instanceof Comment)) {

+			return false;

+		}

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistCommentAnnotatedElement_4002(getNewSource(), getOldTarget());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientTarget() {

+		if(!(oldEnd instanceof Element && newEnd instanceof Element)) {

+			return false;

+		}

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistCommentAnnotatedElement_4002(getOldSource(), getNewTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return reorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return reorientTarget();

+		}

+		throw new IllegalStateException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientSource() throws ExecutionException {

+		getOldSource().getAnnotatedElements().remove(getOldTarget());

+		getNewSource().getAnnotatedElements().add(getOldTarget());

+		return CommandResult.newOKCommandResult(referenceOwner);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientTarget() throws ExecutionException {

+		getOldSource().getAnnotatedElements().remove(getOldTarget());

+		getOldSource().getAnnotatedElements().add(getNewTarget());

+		return CommandResult.newOKCommandResult(referenceOwner);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Comment getOldSource() {

+		return (Comment)referenceOwner;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Comment getNewSource() {

+		return (Comment)newEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Element getOldTarget() {

+		return (Element)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Element getNewTarget() {

+		return (Element)newEnd;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentCreateCommand.java
index 02ba67a78b8..c1c6bcbbbba 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class CommentCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public CommentCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getComment());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Comment newElement = UMLFactory.eINSTANCE.createComment();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Element qualifiedTarget = (Element) target;
-				qualifiedTarget.getOwnedComments()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Comment_2109(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Comment newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Comment;

+import org.eclipse.uml2.uml.Element;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class CommentCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public CommentCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getComment());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Comment newElement = UMLFactory.eINSTANCE.createComment();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Element qualifiedTarget = (Element)target;

+				qualifiedTarget.getOwnedComments().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Comment_2109(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Comment newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentCreateCommandCN.java
index 914a7edec19..db0aedaa365 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/CommentCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class CommentCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public CommentCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getComment());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Comment newElement = UMLFactory.eINSTANCE.createComment();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Element qualifiedTarget = (Element) target;
-				qualifiedTarget.getOwnedComments()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Comment_3097(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Comment newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Comment;

+import org.eclipse.uml2.uml.Element;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class CommentCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public CommentCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getComment());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Comment newElement = UMLFactory.eINSTANCE.createComment();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Element qualifiedTarget = (Element)target;

+				qualifiedTarget.getOwnedComments().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Comment_3097(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Comment newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentCompositeCreateCommand.java
index 2aa77165a14..47874099393 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentCompositeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentCompositeCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Component;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class ComponentCompositeCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public ComponentCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getComponent());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Component newElement = UMLFactory.eINSTANCE.createComponent();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Component_2069(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Component newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Component;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class ComponentCompositeCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public ComponentCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getComponent());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Component newElement = UMLFactory.eINSTANCE.createComponent();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Component_2069(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Component newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentCompositeCreateCommandCN.java
index d38ac2fc0d5..863f8b58a2a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentCompositeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentCompositeCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Component;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class ComponentCompositeCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public ComponentCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getComponent());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Component newElement = UMLFactory.eINSTANCE.createComponent();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Class qualifiedTarget = (Class) target;
-				qualifiedTarget.getNestedClassifiers()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Component_3081(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Component newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.Component;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class ComponentCompositeCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public ComponentCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getComponent());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Component newElement = UMLFactory.eINSTANCE.createComponent();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Class qualifiedTarget = (Class)target;

+				qualifiedTarget.getNestedClassifiers().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Component_3081(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Component newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentRealizationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentRealizationCreateCommand.java
index 66b7c6d58dc..190c326bd37 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentRealizationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentRealizationCreateCommand.java
@@ -1,162 +1,165 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.ComponentRealization;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-
-/**
- * @generated
- */
-public class ComponentRealizationCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	protected final EObject source;
-	/**
-	 * @generated
-	 */
-	protected final EObject target;
-	/**
-	 * @generated
-	 */
-	protected Package container;
-
-	/**
-	 * @generated
-	 */
-	public ComponentRealizationCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
-		super(request.getLabel(), null, request);
-		this.source = source;
-		this.target = target;
-		container = deduceContainer(source, target);
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (source == null && target == null) {
-			return false;
-		}
-		if (source != null && false == source instanceof NamedElement) {
-			return false;
-		}
-		if (target != null && false == target instanceof NamedElement) {
-			return false;
-		}
-		if (getSource() == null) {
-			return true; // link creation is in progress; source is not defined yet
-		}
-		// target may be null here but it's possible to check constraint
-		if (getContainer() == null) {
-			return false;
-		}
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateComponentRealization_4004(getContainer(), getSource(), getTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
-		}
-		ComponentRealization newElement = UMLFactory.eINSTANCE.createComponentRealization();
-		getContainer().getPackagedElements()
-				.add(newElement);
-		newElement.getClients()
-				.add(getSource());
-		newElement.getSuppliers()
-				.add(getTarget());
-		ElementInitializers.getInstance().init_ComponentRealization_4004(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(ComponentRealization newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());
-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setElementToEdit(EObject element) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getSource() {
-		return (NamedElement) source;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getTarget() {
-		return (NamedElement) target;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Package getContainer() {
-		return container;
-	}
-
-	/**
-	 * Default approach is to traverse ancestors of the source to find instance of container.
-	 * Modify with appropriate logic.
-	 * @generated
-	 */
-	protected Package deduceContainer(EObject source, EObject target) {
-		// Find container element for the new link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				return (Package) element;
-			}
-		}
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.ComponentRealization;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+

+/**

+ * @generated

+ */

+public class ComponentRealizationCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	protected final EObject source;

+

+	/**

+	 * @generated

+	 */

+	protected final EObject target;

+

+	/**

+	 * @generated

+	 */

+	protected Package container;

+

+	/**

+	 * @generated

+	 */

+	public ComponentRealizationCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

+		super(request.getLabel(), null, request);

+		this.source = source;

+		this.target = target;

+		container = deduceContainer(source, target);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(source == null && target == null) {

+			return false;

+		}

+		if(source != null && false == source instanceof NamedElement) {

+			return false;

+		}

+		if(target != null && false == target instanceof NamedElement) {

+			return false;

+		}

+		if(getSource() == null) {

+			return true; // link creation is in progress; source is not defined yet

+		}

+		// target may be null here but it's possible to check constraint

+		if(getContainer() == null) {

+			return false;

+		}

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateComponentRealization_4004(getContainer(), getSource(), getTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

+		}

+

+		ComponentRealization newElement = UMLFactory.eINSTANCE.createComponentRealization();

+		getContainer().getPackagedElements().add(newElement);

+		newElement.getClients().add(getSource());

+		newElement.getSuppliers().add(getTarget());

+		ElementInitializers.getInstance().init_ComponentRealization_4004(newElement);

+		doConfigure(newElement, monitor, info);

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(ComponentRealization newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

+		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setElementToEdit(EObject element) {

+		throw new UnsupportedOperationException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getSource() {

+		return (NamedElement)source;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getTarget() {

+		return (NamedElement)target;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Package getContainer() {

+		return container;

+	}

+

+	/**

+	 * Default approach is to traverse ancestors of the source to find instance of container.

+	 * Modify with appropriate logic.

+	 * 

+	 * @generated

+	 */

+	protected Package deduceContainer(EObject source, EObject target) {

+		// Find container element for the new link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				return (Package)element;

+			}

+		}

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentRealizationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentRealizationReorientCommand.java
index 146525c05da..393a6fc9090 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentRealizationReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ComponentRealizationReorientCommand.java
@@ -1,183 +1,176 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.uml2.uml.ComponentRealization;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-
-/**
- * @generated
- */
-public class ComponentRealizationReorientCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private final int reorientDirection;
-	/**
-	 * @generated
-	 */
-	private final EObject oldEnd;
-	/**
-	 * @generated
-	 */
-	private final EObject newEnd;
-
-	/**
-	 * @generated
-	 */
-	public ComponentRealizationReorientCommand(ReorientRelationshipRequest request) {
-		super(request.getLabel(), request.getRelationship(), request);
-		reorientDirection = request.getDirection();
-		oldEnd = request.getOldRelationshipEnd();
-		newEnd = request.getNewRelationshipEnd();
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (false == getElementToEdit() instanceof ComponentRealization) {
-			return false;
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return canReorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return canReorientTarget();
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientSource() {
-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
-			return false;
-		}
-		if (getLink().getSuppliers()
-				.size() != 1) {
-			return false;
-		}
-		NamedElement target = (NamedElement) getLink().getSuppliers()
-				.get(0);
-		if (!(getLink().eContainer() instanceof Package)) {
-			return false;
-		}
-		Package container = (Package) getLink().eContainer();
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistComponentRealization_4004(container, getLink(), getNewSource(), target);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientTarget() {
-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
-			return false;
-		}
-		if (getLink().getClients()
-				.size() != 1) {
-			return false;
-		}
-		NamedElement source = (NamedElement) getLink().getClients()
-				.get(0);
-		if (!(getLink().eContainer() instanceof Package)) {
-			return false;
-		}
-		Package container = (Package) getLink().eContainer();
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistComponentRealization_4004(container, getLink(), source, getNewTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(
-			IProgressMonitor monitor, IAdaptable info)
-			throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return reorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return reorientTarget();
-		}
-		throw new IllegalStateException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientSource() throws ExecutionException {
-		getLink().getClients()
-				.remove(getOldSource());
-		getLink().getClients()
-				.add(getNewSource());
-		return CommandResult.newOKCommandResult(getLink());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientTarget() throws ExecutionException {
-		getLink().getSuppliers()
-				.remove(getOldTarget());
-		getLink().getSuppliers()
-				.add(getNewTarget());
-		return CommandResult.newOKCommandResult(getLink());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected ComponentRealization getLink() {
-		return (ComponentRealization) getElementToEdit();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getOldSource() {
-		return (NamedElement) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getNewSource() {
-		return (NamedElement) newEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getOldTarget() {
-		return (NamedElement) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getNewTarget() {
-		return (NamedElement) newEnd;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.uml2.uml.ComponentRealization;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Package;

+

+/**

+ * @generated

+ */

+public class ComponentRealizationReorientCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private final int reorientDirection;

+

+	/**

+	 * @generated

+	 */

+	private final EObject oldEnd;

+

+	/**

+	 * @generated

+	 */

+	private final EObject newEnd;

+

+	/**

+	 * @generated

+	 */

+	public ComponentRealizationReorientCommand(ReorientRelationshipRequest request) {

+		super(request.getLabel(), request.getRelationship(), request);

+		reorientDirection = request.getDirection();

+		oldEnd = request.getOldRelationshipEnd();

+		newEnd = request.getNewRelationshipEnd();

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(false == getElementToEdit() instanceof ComponentRealization) {

+			return false;

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return canReorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return canReorientTarget();

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientSource() {

+		if(!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

+			return false;

+		}

+		if(getLink().getSuppliers().size() != 1) {

+			return false;

+		}

+		NamedElement target = (NamedElement)getLink().getSuppliers().get(0);

+		if(!(getLink().eContainer() instanceof Package)) {

+			return false;

+		}

+		Package container = (Package)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistComponentRealization_4004(container, getLink(), getNewSource(), target);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientTarget() {

+		if(!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

+			return false;

+		}

+		if(getLink().getClients().size() != 1) {

+			return false;

+		}

+		NamedElement source = (NamedElement)getLink().getClients().get(0);

+		if(!(getLink().eContainer() instanceof Package)) {

+			return false;

+		}

+		Package container = (Package)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistComponentRealization_4004(container, getLink(), source, getNewTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return reorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return reorientTarget();

+		}

+		throw new IllegalStateException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientSource() throws ExecutionException {

+		getLink().getClients().remove(getOldSource());

+		getLink().getClients().add(getNewSource());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientTarget() throws ExecutionException {

+		getLink().getSuppliers().remove(getOldTarget());

+		getLink().getSuppliers().add(getNewTarget());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected ComponentRealization getLink() {

+		return (ComponentRealization)getElementToEdit();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getOldSource() {

+		return (NamedElement)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getNewSource() {

+		return (NamedElement)newEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getOldTarget() {

+		return (NamedElement)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getNewTarget() {

+		return (NamedElement)newEnd;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConnectorCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConnectorCreateCommand.java
index 08896875e8e..205650afe83 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConnectorCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConnectorCreateCommand.java
@@ -1,162 +1,165 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Connector;
-import org.eclipse.uml2.uml.ConnectorEnd;
-import org.eclipse.uml2.uml.StructuredClassifier;
-import org.eclipse.uml2.uml.UMLFactory;
-
-/**
- * @generated
- */
-public class ConnectorCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	protected final EObject source;
-	/**
-	 * @generated
-	 */
-	protected final EObject target;
-	/**
-	 * @generated
-	 */
-	protected StructuredClassifier container;
-
-	/**
-	 * @generated
-	 */
-	public ConnectorCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
-		super(request.getLabel(), null, request);
-		this.source = source;
-		this.target = target;
-		container = deduceContainer(source, target);
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (source == null && target == null) {
-			return false;
-		}
-		if (source != null && false == source instanceof ConnectorEnd) {
-			return false;
-		}
-		if (target != null && false == target instanceof ConnectorEnd) {
-			return false;
-		}
-		if (getSource() == null) {
-			return true; // link creation is in progress; source is not defined yet
-		}
-		// target may be null here but it's possible to check constraint
-		if (getContainer() == null) {
-			return false;
-		}
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateConnector_4013(getContainer(), getSource(), getTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
-		}
-		Connector newElement = UMLFactory.eINSTANCE.createConnector();
-		getContainer().getOwnedConnectors()
-				.add(newElement);
-		newElement.getEnds()
-				.add(getSource());
-		newElement.getEnds()
-				.add(getTarget());
-		ElementInitializers.getInstance().init_Connector_4013(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Connector newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());
-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setElementToEdit(EObject element) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected ConnectorEnd getSource() {
-		return (ConnectorEnd) source;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected ConnectorEnd getTarget() {
-		return (ConnectorEnd) target;
-	}
-
-	/**
-	 * @generated
-	 */
-	public StructuredClassifier getContainer() {
-		return container;
-	}
-
-	/**
-	 * Default approach is to traverse ancestors of the source to find instance of container.
-	 * Modify with appropriate logic.
-	 * @generated
-	 */
-	protected StructuredClassifier deduceContainer(EObject source, EObject target) {
-		// Find container element for the new link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null; element = element.eContainer()) {
-			if (element instanceof StructuredClassifier) {
-				return (StructuredClassifier) element;
-			}
-		}
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Connector;

+import org.eclipse.uml2.uml.ConnectorEnd;

+import org.eclipse.uml2.uml.StructuredClassifier;

+import org.eclipse.uml2.uml.UMLFactory;

+

+/**

+ * @generated

+ */

+public class ConnectorCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	protected final EObject source;

+

+	/**

+	 * @generated

+	 */

+	protected final EObject target;

+

+	/**

+	 * @generated

+	 */

+	protected StructuredClassifier container;

+

+	/**

+	 * @generated

+	 */

+	public ConnectorCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

+		super(request.getLabel(), null, request);

+		this.source = source;

+		this.target = target;

+		container = deduceContainer(source, target);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(source == null && target == null) {

+			return false;

+		}

+		if(source != null && false == source instanceof ConnectorEnd) {

+			return false;

+		}

+		if(target != null && false == target instanceof ConnectorEnd) {

+			return false;

+		}

+		if(getSource() == null) {

+			return true; // link creation is in progress; source is not defined yet

+		}

+		// target may be null here but it's possible to check constraint

+		if(getContainer() == null) {

+			return false;

+		}

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateConnector_4013(getContainer(), getSource(), getTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

+		}

+

+		Connector newElement = UMLFactory.eINSTANCE.createConnector();

+		getContainer().getOwnedConnectors().add(newElement);

+		newElement.getEnds().add(getSource());

+		newElement.getEnds().add(getTarget());

+		ElementInitializers.getInstance().init_Connector_4013(newElement);

+		doConfigure(newElement, monitor, info);

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Connector newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

+		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setElementToEdit(EObject element) {

+		throw new UnsupportedOperationException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected ConnectorEnd getSource() {

+		return (ConnectorEnd)source;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected ConnectorEnd getTarget() {

+		return (ConnectorEnd)target;

+	}

+

+	/**

+	 * @generated

+	 */

+	public StructuredClassifier getContainer() {

+		return container;

+	}

+

+	/**

+	 * Default approach is to traverse ancestors of the source to find instance of container.

+	 * Modify with appropriate logic.

+	 * 

+	 * @generated

+	 */

+	protected StructuredClassifier deduceContainer(EObject source, EObject target) {

+		// Find container element for the new link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null; element = element.eContainer()) {

+			if(element instanceof StructuredClassifier) {

+				return (StructuredClassifier)element;

+			}

+		}

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConnectorReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConnectorReorientCommand.java
index 276d100135a..56f50b5da96 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConnectorReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConnectorReorientCommand.java
@@ -1,183 +1,176 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.uml2.uml.Connector;
-import org.eclipse.uml2.uml.ConnectorEnd;
-import org.eclipse.uml2.uml.StructuredClassifier;
-
-/**
- * @generated
- */
-public class ConnectorReorientCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private final int reorientDirection;
-	/**
-	 * @generated
-	 */
-	private final EObject oldEnd;
-	/**
-	 * @generated
-	 */
-	private final EObject newEnd;
-
-	/**
-	 * @generated
-	 */
-	public ConnectorReorientCommand(ReorientRelationshipRequest request) {
-		super(request.getLabel(), request.getRelationship(), request);
-		reorientDirection = request.getDirection();
-		oldEnd = request.getOldRelationshipEnd();
-		newEnd = request.getNewRelationshipEnd();
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (false == getElementToEdit() instanceof Connector) {
-			return false;
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return canReorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return canReorientTarget();
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientSource() {
-		if (!(oldEnd instanceof ConnectorEnd && newEnd instanceof ConnectorEnd)) {
-			return false;
-		}
-		if (getLink().getEnds()
-				.size() != 1) {
-			return false;
-		}
-		ConnectorEnd target = (ConnectorEnd) getLink().getEnds()
-				.get(0);
-		if (!(getLink().eContainer() instanceof StructuredClassifier)) {
-			return false;
-		}
-		StructuredClassifier container = (StructuredClassifier) getLink().eContainer();
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistConnector_4013(container, getLink(), getNewSource(), target);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientTarget() {
-		if (!(oldEnd instanceof ConnectorEnd && newEnd instanceof ConnectorEnd)) {
-			return false;
-		}
-		if (getLink().getEnds()
-				.size() != 1) {
-			return false;
-		}
-		ConnectorEnd source = (ConnectorEnd) getLink().getEnds()
-				.get(0);
-		if (!(getLink().eContainer() instanceof StructuredClassifier)) {
-			return false;
-		}
-		StructuredClassifier container = (StructuredClassifier) getLink().eContainer();
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistConnector_4013(container, getLink(), source, getNewTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(
-			IProgressMonitor monitor, IAdaptable info)
-			throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return reorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return reorientTarget();
-		}
-		throw new IllegalStateException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientSource() throws ExecutionException {
-		getLink().getEnds()
-				.remove(getOldSource());
-		getLink().getEnds()
-				.add(getNewSource());
-		return CommandResult.newOKCommandResult(getLink());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientTarget() throws ExecutionException {
-		getLink().getEnds()
-				.remove(getOldTarget());
-		getLink().getEnds()
-				.add(getNewTarget());
-		return CommandResult.newOKCommandResult(getLink());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Connector getLink() {
-		return (Connector) getElementToEdit();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected ConnectorEnd getOldSource() {
-		return (ConnectorEnd) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected ConnectorEnd getNewSource() {
-		return (ConnectorEnd) newEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected ConnectorEnd getOldTarget() {
-		return (ConnectorEnd) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected ConnectorEnd getNewTarget() {
-		return (ConnectorEnd) newEnd;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.uml2.uml.Connector;

+import org.eclipse.uml2.uml.ConnectorEnd;

+import org.eclipse.uml2.uml.StructuredClassifier;

+

+/**

+ * @generated

+ */

+public class ConnectorReorientCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private final int reorientDirection;

+

+	/**

+	 * @generated

+	 */

+	private final EObject oldEnd;

+

+	/**

+	 * @generated

+	 */

+	private final EObject newEnd;

+

+	/**

+	 * @generated

+	 */

+	public ConnectorReorientCommand(ReorientRelationshipRequest request) {

+		super(request.getLabel(), request.getRelationship(), request);

+		reorientDirection = request.getDirection();

+		oldEnd = request.getOldRelationshipEnd();

+		newEnd = request.getNewRelationshipEnd();

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(false == getElementToEdit() instanceof Connector) {

+			return false;

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return canReorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return canReorientTarget();

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientSource() {

+		if(!(oldEnd instanceof ConnectorEnd && newEnd instanceof ConnectorEnd)) {

+			return false;

+		}

+		if(getLink().getEnds().size() != 1) {

+			return false;

+		}

+		ConnectorEnd target = (ConnectorEnd)getLink().getEnds().get(0);

+		if(!(getLink().eContainer() instanceof StructuredClassifier)) {

+			return false;

+		}

+		StructuredClassifier container = (StructuredClassifier)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistConnector_4013(container, getLink(), getNewSource(), target);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientTarget() {

+		if(!(oldEnd instanceof ConnectorEnd && newEnd instanceof ConnectorEnd)) {

+			return false;

+		}

+		if(getLink().getEnds().size() != 1) {

+			return false;

+		}

+		ConnectorEnd source = (ConnectorEnd)getLink().getEnds().get(0);

+		if(!(getLink().eContainer() instanceof StructuredClassifier)) {

+			return false;

+		}

+		StructuredClassifier container = (StructuredClassifier)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistConnector_4013(container, getLink(), source, getNewTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return reorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return reorientTarget();

+		}

+		throw new IllegalStateException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientSource() throws ExecutionException {

+		getLink().getEnds().remove(getOldSource());

+		getLink().getEnds().add(getNewSource());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientTarget() throws ExecutionException {

+		getLink().getEnds().remove(getOldTarget());

+		getLink().getEnds().add(getNewTarget());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Connector getLink() {

+		return (Connector)getElementToEdit();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected ConnectorEnd getOldSource() {

+		return (ConnectorEnd)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected ConnectorEnd getNewSource() {

+		return (ConnectorEnd)newEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected ConnectorEnd getOldTarget() {

+		return (ConnectorEnd)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected ConnectorEnd getNewTarget() {

+		return (ConnectorEnd)newEnd;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintConstrainedElementCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintConstrainedElementCreateCommand.java
index b2a16251e1a..7bb4435a9fc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintConstrainedElementCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintConstrainedElementCreateCommand.java
@@ -1,101 +1,104 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.uml2.uml.Constraint;
-import org.eclipse.uml2.uml.Element;
-
-/**
- * @generated
- */
-public class ConstraintConstrainedElementCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	protected final EObject source;
-	/**
-	 * @generated
-	 */
-	protected final EObject target;
-
-	/**
-	 * @generated
-	 */
-	public ConstraintConstrainedElementCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
-		super(request.getLabel(), null, request);
-		this.source = source;
-		this.target = target;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (source == null && target == null) {
-			return false;
-		}
-		if (source != null && false == source instanceof Constraint) {
-			return false;
-		}
-		if (target != null && false == target instanceof Element) {
-			return false;
-		}
-		if (getSource() == null) {
-			return true; // link creation is in progress; source is not defined yet
-		}
-		// target may be null here but it's possible to check constraint
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateConstraintConstrainedElement_4003(getSource(), getTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
-		}
-		if (getSource() != null && getTarget() != null) {
-			getSource().getConstrainedElements()
-					.add(getTarget());
-		}
-		return CommandResult.newOKCommandResult();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setElementToEdit(EObject element) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Constraint getSource() {
-		return (Constraint) source;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Element getTarget() {
-		return (Element) target;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.uml2.uml.Constraint;

+import org.eclipse.uml2.uml.Element;

+

+/**

+ * @generated

+ */

+public class ConstraintConstrainedElementCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	protected final EObject source;

+

+	/**

+	 * @generated

+	 */

+	protected final EObject target;

+

+	/**

+	 * @generated

+	 */

+	public ConstraintConstrainedElementCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

+		super(request.getLabel(), null, request);

+		this.source = source;

+		this.target = target;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(source == null && target == null) {

+			return false;

+		}

+		if(source != null && false == source instanceof Constraint) {

+			return false;

+		}

+		if(target != null && false == target instanceof Element) {

+			return false;

+		}

+		if(getSource() == null) {

+			return true; // link creation is in progress; source is not defined yet

+		}

+		// target may be null here but it's possible to check constraint

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateConstraintConstrainedElement_4003(getSource(), getTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

+		}

+

+		if(getSource() != null && getTarget() != null) {

+			getSource().getConstrainedElements().add(getTarget());

+		}

+		return CommandResult.newOKCommandResult();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setElementToEdit(EObject element) {

+		throw new UnsupportedOperationException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Constraint getSource() {

+		return (Constraint)source;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Element getTarget() {

+		return (Element)target;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintConstrainedElementReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintConstrainedElementReorientCommand.java
index 3636fbfce4a..c6892109e56 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintConstrainedElementReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintConstrainedElementReorientCommand.java
@@ -1,161 +1,159 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.uml2.uml.Constraint;
-import org.eclipse.uml2.uml.Element;
-
-/**
- * @generated
- */
-public class ConstraintConstrainedElementReorientCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private final int reorientDirection;
-	/**
-	 * @generated
-	 */
-	private final EObject referenceOwner;
-	/**
-	 * @generated
-	 */
-	private final EObject oldEnd;
-	/**
-	 * @generated
-	 */
-	private final EObject newEnd;
-
-	/**
-	 * @generated
-	 */
-	public ConstraintConstrainedElementReorientCommand(ReorientReferenceRelationshipRequest request) {
-		super(request.getLabel(), null, request);
-		reorientDirection = request.getDirection();
-		referenceOwner = request.getReferenceOwner();
-		oldEnd = request.getOldRelationshipEnd();
-		newEnd = request.getNewRelationshipEnd();
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (false == referenceOwner instanceof Constraint) {
-			return false;
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return canReorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return canReorientTarget();
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientSource() {
-		if (!(oldEnd instanceof Element && newEnd instanceof Constraint)) {
-			return false;
-		}
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistConstraintConstrainedElement_4003(getNewSource(), getOldTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientTarget() {
-		if (!(oldEnd instanceof Element && newEnd instanceof Element)) {
-			return false;
-		}
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistConstraintConstrainedElement_4003(getOldSource(), getNewTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(
-			IProgressMonitor monitor, IAdaptable info)
-			throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return reorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return reorientTarget();
-		}
-		throw new IllegalStateException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientSource() throws ExecutionException {
-		getOldSource().getConstrainedElements()
-				.remove(getOldTarget());
-		getNewSource().getConstrainedElements()
-				.add(getOldTarget());
-		return CommandResult.newOKCommandResult(referenceOwner);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientTarget() throws ExecutionException {
-		getOldSource().getConstrainedElements()
-				.remove(getOldTarget());
-		getOldSource().getConstrainedElements()
-				.add(getNewTarget());
-		return CommandResult.newOKCommandResult(referenceOwner);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Constraint getOldSource() {
-		return (Constraint) referenceOwner;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Constraint getNewSource() {
-		return (Constraint) newEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Element getOldTarget() {
-		return (Element) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Element getNewTarget() {
-		return (Element) newEnd;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.uml2.uml.Constraint;

+import org.eclipse.uml2.uml.Element;

+

+/**

+ * @generated

+ */

+public class ConstraintConstrainedElementReorientCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private final int reorientDirection;

+

+	/**

+	 * @generated

+	 */

+	private final EObject referenceOwner;

+

+	/**

+	 * @generated

+	 */

+	private final EObject oldEnd;

+

+	/**

+	 * @generated

+	 */

+	private final EObject newEnd;

+

+	/**

+	 * @generated

+	 */

+	public ConstraintConstrainedElementReorientCommand(ReorientReferenceRelationshipRequest request) {

+		super(request.getLabel(), null, request);

+		reorientDirection = request.getDirection();

+		referenceOwner = request.getReferenceOwner();

+		oldEnd = request.getOldRelationshipEnd();

+		newEnd = request.getNewRelationshipEnd();

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(false == referenceOwner instanceof Constraint) {

+			return false;

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return canReorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return canReorientTarget();

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientSource() {

+		if(!(oldEnd instanceof Element && newEnd instanceof Constraint)) {

+			return false;

+		}

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistConstraintConstrainedElement_4003(getNewSource(), getOldTarget());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientTarget() {

+		if(!(oldEnd instanceof Element && newEnd instanceof Element)) {

+			return false;

+		}

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistConstraintConstrainedElement_4003(getOldSource(), getNewTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return reorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return reorientTarget();

+		}

+		throw new IllegalStateException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientSource() throws ExecutionException {

+		getOldSource().getConstrainedElements().remove(getOldTarget());

+		getNewSource().getConstrainedElements().add(getOldTarget());

+		return CommandResult.newOKCommandResult(referenceOwner);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientTarget() throws ExecutionException {

+		getOldSource().getConstrainedElements().remove(getOldTarget());

+		getOldSource().getConstrainedElements().add(getNewTarget());

+		return CommandResult.newOKCommandResult(referenceOwner);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Constraint getOldSource() {

+		return (Constraint)referenceOwner;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Constraint getNewSource() {

+		return (Constraint)newEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Element getOldTarget() {

+		return (Element)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Element getNewTarget() {

+		return (Element)newEnd;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintCreateCommand.java
index 68fbb4db1e9..a974cc82dd3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Constraint;
-import org.eclipse.uml2.uml.Namespace;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class ConstraintCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public ConstraintCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getConstraint());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Constraint newElement = UMLFactory.eINSTANCE.createConstraint();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Namespace qualifiedTarget = (Namespace) target;
-				qualifiedTarget.getOwnedRules()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Constraint_2114(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Constraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Constraint;

+import org.eclipse.uml2.uml.Namespace;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class ConstraintCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public ConstraintCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getConstraint());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Constraint newElement = UMLFactory.eINSTANCE.createConstraint();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Namespace qualifiedTarget = (Namespace)target;

+				qualifiedTarget.getOwnedRules().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Constraint_2114(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Constraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintCreateCommandCN.java
index 96a58eeaeda..37ff8308d16 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ConstraintCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Constraint;
-import org.eclipse.uml2.uml.Namespace;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class ConstraintCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public ConstraintCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getConstraint());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Constraint newElement = UMLFactory.eINSTANCE.createConstraint();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Namespace qualifiedTarget = (Namespace) target;
-				qualifiedTarget.getOwnedRules()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Constraint_3120(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Constraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Constraint;

+import org.eclipse.uml2.uml.Namespace;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class ConstraintCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public ConstraintCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getConstraint());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Constraint newElement = UMLFactory.eINSTANCE.createConstraint();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Namespace qualifiedTarget = (Namespace)target;

+				qualifiedTarget.getOwnedRules().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Constraint_3120(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Constraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DataTypeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DataTypeCreateCommand.java
index 4ba5e2cd63e..0889431357f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DataTypeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DataTypeCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.DataType;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class DataTypeCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public DataTypeCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDataType());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		DataType newElement = UMLFactory.eINSTANCE.createDataType();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_DataType_2068(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(DataType newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.DataType;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class DataTypeCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public DataTypeCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDataType());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		DataType newElement = UMLFactory.eINSTANCE.createDataType();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_DataType_2068(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(DataType newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DataTypeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DataTypeCreateCommandCN.java
index 99fc9669f8c..ffd045dc5af 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DataTypeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DataTypeCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.DataType;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class DataTypeCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public DataTypeCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDataType());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		DataType newElement = UMLFactory.eINSTANCE.createDataType();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Class qualifiedTarget = (Class) target;
-				qualifiedTarget.getNestedClassifiers()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_DataType_3080(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(DataType newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.DataType;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class DataTypeCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public DataTypeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDataType());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		DataType newElement = UMLFactory.eINSTANCE.createDataType();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Class qualifiedTarget = (Class)target;

+				qualifiedTarget.getNestedClassifiers().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_DataType_3080(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(DataType newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DependencyCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DependencyCreateCommand.java
index e27a1ecdb0c..28ca4523bc3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DependencyCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DependencyCreateCommand.java
@@ -1,162 +1,165 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Dependency;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-
-/**
- * @generated
- */
-public class DependencyCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	protected final EObject source;
-	/**
-	 * @generated
-	 */
-	protected final EObject target;
-	/**
-	 * @generated
-	 */
-	protected Package container;
-
-	/**
-	 * @generated
-	 */
-	public DependencyCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
-		super(request.getLabel(), null, request);
-		this.source = source;
-		this.target = target;
-		container = deduceContainer(source, target);
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (source == null && target == null) {
-			return false;
-		}
-		if (source != null && false == source instanceof NamedElement) {
-			return false;
-		}
-		if (target != null && false == target instanceof NamedElement) {
-			return false;
-		}
-		if (getSource() == null) {
-			return true; // link creation is in progress; source is not defined yet
-		}
-		// target may be null here but it's possible to check constraint
-		if (getContainer() == null) {
-			return false;
-		}
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateDependency_4010(getContainer(), getSource(), getTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
-		}
-		Dependency newElement = UMLFactory.eINSTANCE.createDependency();
-		getContainer().getPackagedElements()
-				.add(newElement);
-		newElement.getClients()
-				.add(getSource());
-		newElement.getSuppliers()
-				.add(getTarget());
-		ElementInitializers.getInstance().init_Dependency_4010(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Dependency newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());
-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setElementToEdit(EObject element) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getSource() {
-		return (NamedElement) source;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getTarget() {
-		return (NamedElement) target;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Package getContainer() {
-		return container;
-	}
-
-	/**
-	 * Default approach is to traverse ancestors of the source to find instance of container.
-	 * Modify with appropriate logic.
-	 * @generated
-	 */
-	protected Package deduceContainer(EObject source, EObject target) {
-		// Find container element for the new link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				return (Package) element;
-			}
-		}
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Dependency;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+

+/**

+ * @generated

+ */

+public class DependencyCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	protected final EObject source;

+

+	/**

+	 * @generated

+	 */

+	protected final EObject target;

+

+	/**

+	 * @generated

+	 */

+	protected Package container;

+

+	/**

+	 * @generated

+	 */

+	public DependencyCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

+		super(request.getLabel(), null, request);

+		this.source = source;

+		this.target = target;

+		container = deduceContainer(source, target);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(source == null && target == null) {

+			return false;

+		}

+		if(source != null && false == source instanceof NamedElement) {

+			return false;

+		}

+		if(target != null && false == target instanceof NamedElement) {

+			return false;

+		}

+		if(getSource() == null) {

+			return true; // link creation is in progress; source is not defined yet

+		}

+		// target may be null here but it's possible to check constraint

+		if(getContainer() == null) {

+			return false;

+		}

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateDependency_4010(getContainer(), getSource(), getTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

+		}

+

+		Dependency newElement = UMLFactory.eINSTANCE.createDependency();

+		getContainer().getPackagedElements().add(newElement);

+		newElement.getClients().add(getSource());

+		newElement.getSuppliers().add(getTarget());

+		ElementInitializers.getInstance().init_Dependency_4010(newElement);

+		doConfigure(newElement, monitor, info);

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Dependency newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

+		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setElementToEdit(EObject element) {

+		throw new UnsupportedOperationException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getSource() {

+		return (NamedElement)source;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getTarget() {

+		return (NamedElement)target;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Package getContainer() {

+		return container;

+	}

+

+	/**

+	 * Default approach is to traverse ancestors of the source to find instance of container.

+	 * Modify with appropriate logic.

+	 * 

+	 * @generated

+	 */

+	protected Package deduceContainer(EObject source, EObject target) {

+		// Find container element for the new link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				return (Package)element;

+			}

+		}

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DependencyReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DependencyReorientCommand.java
index 2bc2d752c4e..679eed90e6e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DependencyReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DependencyReorientCommand.java
@@ -1,183 +1,176 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.uml2.uml.Dependency;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-
-/**
- * @generated
- */
-public class DependencyReorientCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private final int reorientDirection;
-	/**
-	 * @generated
-	 */
-	private final EObject oldEnd;
-	/**
-	 * @generated
-	 */
-	private final EObject newEnd;
-
-	/**
-	 * @generated
-	 */
-	public DependencyReorientCommand(ReorientRelationshipRequest request) {
-		super(request.getLabel(), request.getRelationship(), request);
-		reorientDirection = request.getDirection();
-		oldEnd = request.getOldRelationshipEnd();
-		newEnd = request.getNewRelationshipEnd();
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (false == getElementToEdit() instanceof Dependency) {
-			return false;
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return canReorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return canReorientTarget();
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientSource() {
-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
-			return false;
-		}
-		if (getLink().getSuppliers()
-				.size() != 1) {
-			return false;
-		}
-		NamedElement target = (NamedElement) getLink().getSuppliers()
-				.get(0);
-		if (!(getLink().eContainer() instanceof Package)) {
-			return false;
-		}
-		Package container = (Package) getLink().eContainer();
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDependency_4010(container, getLink(), getNewSource(), target);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientTarget() {
-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
-			return false;
-		}
-		if (getLink().getClients()
-				.size() != 1) {
-			return false;
-		}
-		NamedElement source = (NamedElement) getLink().getClients()
-				.get(0);
-		if (!(getLink().eContainer() instanceof Package)) {
-			return false;
-		}
-		Package container = (Package) getLink().eContainer();
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDependency_4010(container, getLink(), source, getNewTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(
-			IProgressMonitor monitor, IAdaptable info)
-			throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return reorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return reorientTarget();
-		}
-		throw new IllegalStateException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientSource() throws ExecutionException {
-		getLink().getClients()
-				.remove(getOldSource());
-		getLink().getClients()
-				.add(getNewSource());
-		return CommandResult.newOKCommandResult(getLink());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientTarget() throws ExecutionException {
-		getLink().getSuppliers()
-				.remove(getOldTarget());
-		getLink().getSuppliers()
-				.add(getNewTarget());
-		return CommandResult.newOKCommandResult(getLink());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Dependency getLink() {
-		return (Dependency) getElementToEdit();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getOldSource() {
-		return (NamedElement) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getNewSource() {
-		return (NamedElement) newEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getOldTarget() {
-		return (NamedElement) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getNewTarget() {
-		return (NamedElement) newEnd;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.uml2.uml.Dependency;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Package;

+

+/**

+ * @generated

+ */

+public class DependencyReorientCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private final int reorientDirection;

+

+	/**

+	 * @generated

+	 */

+	private final EObject oldEnd;

+

+	/**

+	 * @generated

+	 */

+	private final EObject newEnd;

+

+	/**

+	 * @generated

+	 */

+	public DependencyReorientCommand(ReorientRelationshipRequest request) {

+		super(request.getLabel(), request.getRelationship(), request);

+		reorientDirection = request.getDirection();

+		oldEnd = request.getOldRelationshipEnd();

+		newEnd = request.getNewRelationshipEnd();

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(false == getElementToEdit() instanceof Dependency) {

+			return false;

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return canReorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return canReorientTarget();

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientSource() {

+		if(!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

+			return false;

+		}

+		if(getLink().getSuppliers().size() != 1) {

+			return false;

+		}

+		NamedElement target = (NamedElement)getLink().getSuppliers().get(0);

+		if(!(getLink().eContainer() instanceof Package)) {

+			return false;

+		}

+		Package container = (Package)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDependency_4010(container, getLink(), getNewSource(), target);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientTarget() {

+		if(!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

+			return false;

+		}

+		if(getLink().getClients().size() != 1) {

+			return false;

+		}

+		NamedElement source = (NamedElement)getLink().getClients().get(0);

+		if(!(getLink().eContainer() instanceof Package)) {

+			return false;

+		}

+		Package container = (Package)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDependency_4010(container, getLink(), source, getNewTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return reorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return reorientTarget();

+		}

+		throw new IllegalStateException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientSource() throws ExecutionException {

+		getLink().getClients().remove(getOldSource());

+		getLink().getClients().add(getNewSource());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientTarget() throws ExecutionException {

+		getLink().getSuppliers().remove(getOldTarget());

+		getLink().getSuppliers().add(getNewTarget());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Dependency getLink() {

+		return (Dependency)getElementToEdit();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getOldSource() {

+		return (NamedElement)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getNewSource() {

+		return (NamedElement)newEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getOldTarget() {

+		return (NamedElement)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getNewTarget() {

+		return (NamedElement)newEnd;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentCreateCommand.java
index d6e31299b58..3d68992cf71 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentCreateCommand.java
@@ -1,162 +1,165 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Deployment;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-
-/**
- * @generated
- */
-public class DeploymentCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	protected final EObject source;
-	/**
-	 * @generated
-	 */
-	protected final EObject target;
-	/**
-	 * @generated
-	 */
-	protected Package container;
-
-	/**
-	 * @generated
-	 */
-	public DeploymentCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
-		super(request.getLabel(), null, request);
-		this.source = source;
-		this.target = target;
-		container = deduceContainer(source, target);
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (source == null && target == null) {
-			return false;
-		}
-		if (source != null && false == source instanceof NamedElement) {
-			return false;
-		}
-		if (target != null && false == target instanceof NamedElement) {
-			return false;
-		}
-		if (getSource() == null) {
-			return true; // link creation is in progress; source is not defined yet
-		}
-		// target may be null here but it's possible to check constraint
-		if (getContainer() == null) {
-			return false;
-		}
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateDeployment_4009(getContainer(), getSource(), getTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
-		}
-		Deployment newElement = UMLFactory.eINSTANCE.createDeployment();
-		getContainer().getPackagedElements()
-				.add(newElement);
-		newElement.getClients()
-				.add(getSource());
-		newElement.getSuppliers()
-				.add(getTarget());
-		ElementInitializers.getInstance().init_Deployment_4009(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Deployment newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());
-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setElementToEdit(EObject element) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getSource() {
-		return (NamedElement) source;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getTarget() {
-		return (NamedElement) target;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Package getContainer() {
-		return container;
-	}
-
-	/**
-	 * Default approach is to traverse ancestors of the source to find instance of container.
-	 * Modify with appropriate logic.
-	 * @generated
-	 */
-	protected Package deduceContainer(EObject source, EObject target) {
-		// Find container element for the new link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				return (Package) element;
-			}
-		}
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Deployment;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+

+/**

+ * @generated

+ */

+public class DeploymentCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	protected final EObject source;

+

+	/**

+	 * @generated

+	 */

+	protected final EObject target;

+

+	/**

+	 * @generated

+	 */

+	protected Package container;

+

+	/**

+	 * @generated

+	 */

+	public DeploymentCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

+		super(request.getLabel(), null, request);

+		this.source = source;

+		this.target = target;

+		container = deduceContainer(source, target);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(source == null && target == null) {

+			return false;

+		}

+		if(source != null && false == source instanceof NamedElement) {

+			return false;

+		}

+		if(target != null && false == target instanceof NamedElement) {

+			return false;

+		}

+		if(getSource() == null) {

+			return true; // link creation is in progress; source is not defined yet

+		}

+		// target may be null here but it's possible to check constraint

+		if(getContainer() == null) {

+			return false;

+		}

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateDeployment_4009(getContainer(), getSource(), getTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

+		}

+

+		Deployment newElement = UMLFactory.eINSTANCE.createDeployment();

+		getContainer().getPackagedElements().add(newElement);

+		newElement.getClients().add(getSource());

+		newElement.getSuppliers().add(getTarget());

+		ElementInitializers.getInstance().init_Deployment_4009(newElement);

+		doConfigure(newElement, monitor, info);

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Deployment newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

+		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setElementToEdit(EObject element) {

+		throw new UnsupportedOperationException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getSource() {

+		return (NamedElement)source;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getTarget() {

+		return (NamedElement)target;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Package getContainer() {

+		return container;

+	}

+

+	/**

+	 * Default approach is to traverse ancestors of the source to find instance of container.

+	 * Modify with appropriate logic.

+	 * 

+	 * @generated

+	 */

+	protected Package deduceContainer(EObject source, EObject target) {

+		// Find container element for the new link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				return (Package)element;

+			}

+		}

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentReorientCommand.java
index 4a72cdf318f..137874815b3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentReorientCommand.java
@@ -1,183 +1,176 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.uml2.uml.Deployment;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-
-/**
- * @generated
- */
-public class DeploymentReorientCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private final int reorientDirection;
-	/**
-	 * @generated
-	 */
-	private final EObject oldEnd;
-	/**
-	 * @generated
-	 */
-	private final EObject newEnd;
-
-	/**
-	 * @generated
-	 */
-	public DeploymentReorientCommand(ReorientRelationshipRequest request) {
-		super(request.getLabel(), request.getRelationship(), request);
-		reorientDirection = request.getDirection();
-		oldEnd = request.getOldRelationshipEnd();
-		newEnd = request.getNewRelationshipEnd();
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (false == getElementToEdit() instanceof Deployment) {
-			return false;
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return canReorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return canReorientTarget();
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientSource() {
-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
-			return false;
-		}
-		if (getLink().getSuppliers()
-				.size() != 1) {
-			return false;
-		}
-		NamedElement target = (NamedElement) getLink().getSuppliers()
-				.get(0);
-		if (!(getLink().eContainer() instanceof Package)) {
-			return false;
-		}
-		Package container = (Package) getLink().eContainer();
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDeployment_4009(container, getLink(), getNewSource(), target);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientTarget() {
-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
-			return false;
-		}
-		if (getLink().getClients()
-				.size() != 1) {
-			return false;
-		}
-		NamedElement source = (NamedElement) getLink().getClients()
-				.get(0);
-		if (!(getLink().eContainer() instanceof Package)) {
-			return false;
-		}
-		Package container = (Package) getLink().eContainer();
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDeployment_4009(container, getLink(), source, getNewTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(
-			IProgressMonitor monitor, IAdaptable info)
-			throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return reorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return reorientTarget();
-		}
-		throw new IllegalStateException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientSource() throws ExecutionException {
-		getLink().getClients()
-				.remove(getOldSource());
-		getLink().getClients()
-				.add(getNewSource());
-		return CommandResult.newOKCommandResult(getLink());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientTarget() throws ExecutionException {
-		getLink().getSuppliers()
-				.remove(getOldTarget());
-		getLink().getSuppliers()
-				.add(getNewTarget());
-		return CommandResult.newOKCommandResult(getLink());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Deployment getLink() {
-		return (Deployment) getElementToEdit();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getOldSource() {
-		return (NamedElement) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getNewSource() {
-		return (NamedElement) newEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getOldTarget() {
-		return (NamedElement) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getNewTarget() {
-		return (NamedElement) newEnd;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.uml2.uml.Deployment;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Package;

+

+/**

+ * @generated

+ */

+public class DeploymentReorientCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private final int reorientDirection;

+

+	/**

+	 * @generated

+	 */

+	private final EObject oldEnd;

+

+	/**

+	 * @generated

+	 */

+	private final EObject newEnd;

+

+	/**

+	 * @generated

+	 */

+	public DeploymentReorientCommand(ReorientRelationshipRequest request) {

+		super(request.getLabel(), request.getRelationship(), request);

+		reorientDirection = request.getDirection();

+		oldEnd = request.getOldRelationshipEnd();

+		newEnd = request.getNewRelationshipEnd();

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(false == getElementToEdit() instanceof Deployment) {

+			return false;

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return canReorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return canReorientTarget();

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientSource() {

+		if(!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

+			return false;

+		}

+		if(getLink().getSuppliers().size() != 1) {

+			return false;

+		}

+		NamedElement target = (NamedElement)getLink().getSuppliers().get(0);

+		if(!(getLink().eContainer() instanceof Package)) {

+			return false;

+		}

+		Package container = (Package)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDeployment_4009(container, getLink(), getNewSource(), target);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientTarget() {

+		if(!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

+			return false;

+		}

+		if(getLink().getClients().size() != 1) {

+			return false;

+		}

+		NamedElement source = (NamedElement)getLink().getClients().get(0);

+		if(!(getLink().eContainer() instanceof Package)) {

+			return false;

+		}

+		Package container = (Package)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDeployment_4009(container, getLink(), source, getNewTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return reorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return reorientTarget();

+		}

+		throw new IllegalStateException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientSource() throws ExecutionException {

+		getLink().getClients().remove(getOldSource());

+		getLink().getClients().add(getNewSource());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientTarget() throws ExecutionException {

+		getLink().getSuppliers().remove(getOldTarget());

+		getLink().getSuppliers().add(getNewTarget());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Deployment getLink() {

+		return (Deployment)getElementToEdit();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getOldSource() {

+		return (NamedElement)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getNewSource() {

+		return (NamedElement)newEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getOldTarget() {

+		return (NamedElement)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getNewTarget() {

+		return (NamedElement)newEnd;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentSpecificationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentSpecificationCreateCommand.java
index 291524e78cb..579953b6433 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentSpecificationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentSpecificationCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.DeploymentSpecification;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class DeploymentSpecificationCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public DeploymentSpecificationCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDeploymentSpecification());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		DeploymentSpecification newElement = UMLFactory.eINSTANCE.createDeploymentSpecification();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_DeploymentSpecification_2078(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(DeploymentSpecification newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.DeploymentSpecification;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class DeploymentSpecificationCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public DeploymentSpecificationCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDeploymentSpecification());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		DeploymentSpecification newElement = UMLFactory.eINSTANCE.createDeploymentSpecification();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_DeploymentSpecification_2078(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(DeploymentSpecification newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentSpecificationCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentSpecificationCreateCommandCN.java
index 59d83430a39..09b55007a00 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentSpecificationCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeploymentSpecificationCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.DeploymentSpecification;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class DeploymentSpecificationCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public DeploymentSpecificationCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDeploymentSpecification());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		DeploymentSpecification newElement = UMLFactory.eINSTANCE.createDeploymentSpecification();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Class qualifiedTarget = (Class) target;
-				qualifiedTarget.getNestedClassifiers()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_DeploymentSpecification_3092(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(DeploymentSpecification newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.DeploymentSpecification;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class DeploymentSpecificationCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public DeploymentSpecificationCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDeploymentSpecification());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		DeploymentSpecification newElement = UMLFactory.eINSTANCE.createDeploymentSpecification();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Class qualifiedTarget = (Class)target;

+				qualifiedTarget.getNestedClassifiers().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_DeploymentSpecification_3092(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(DeploymentSpecification newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeviceCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeviceCompositeCreateCommand.java
index be759485868..d53ceb6e539 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeviceCompositeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeviceCompositeCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Device;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class DeviceCompositeCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public DeviceCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDevice());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Device newElement = UMLFactory.eINSTANCE.createDevice();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Device_2070(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Device newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Device;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class DeviceCompositeCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public DeviceCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDevice());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Device newElement = UMLFactory.eINSTANCE.createDevice();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Device_2070(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Device newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeviceCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeviceCompositeCreateCommandCN.java
index c82dd5b94ed..69daff90688 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeviceCompositeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DeviceCompositeCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Device;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class DeviceCompositeCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public DeviceCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDevice());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Device newElement = UMLFactory.eINSTANCE.createDevice();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Class qualifiedTarget = (Class) target;
-				qualifiedTarget.getNestedClassifiers()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Device_3082(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Device newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.Device;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class DeviceCompositeCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public DeviceCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDevice());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Device newElement = UMLFactory.eINSTANCE.createDevice();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Class qualifiedTarget = (Class)target;

+				qualifiedTarget.getNestedClassifiers().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Device_3082(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Device newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationConstraintCreateCommand.java
index 5566374d977..9e2dcf495b7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationConstraintCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationConstraintCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.DurationConstraint;
-import org.eclipse.uml2.uml.Namespace;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class DurationConstraintCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public DurationConstraintCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationConstraint());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		DurationConstraint newElement = UMLFactory.eINSTANCE.createDurationConstraint();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Namespace qualifiedTarget = (Namespace) target;
-				qualifiedTarget.getOwnedRules()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_DurationConstraint_2110(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(DurationConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.DurationConstraint;

+import org.eclipse.uml2.uml.Namespace;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class DurationConstraintCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public DurationConstraintCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationConstraint());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		DurationConstraint newElement = UMLFactory.eINSTANCE.createDurationConstraint();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Namespace qualifiedTarget = (Namespace)target;

+				qualifiedTarget.getOwnedRules().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_DurationConstraint_2110(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(DurationConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationConstraintCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationConstraintCreateCommandCN.java
index aee22241b71..a6751de995a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationConstraintCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationConstraintCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.DurationConstraint;
-import org.eclipse.uml2.uml.Namespace;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class DurationConstraintCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public DurationConstraintCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationConstraint());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		DurationConstraint newElement = UMLFactory.eINSTANCE.createDurationConstraint();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Namespace qualifiedTarget = (Namespace) target;
-				qualifiedTarget.getOwnedRules()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_DurationConstraint_3116(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(DurationConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.DurationConstraint;

+import org.eclipse.uml2.uml.Namespace;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class DurationConstraintCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public DurationConstraintCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationConstraint());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		DurationConstraint newElement = UMLFactory.eINSTANCE.createDurationConstraint();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Namespace qualifiedTarget = (Namespace)target;

+				qualifiedTarget.getOwnedRules().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_DurationConstraint_3116(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(DurationConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationCreateCommand.java
index ac1ec992749..03e39d5bd77 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Duration;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class DurationCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public DurationCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDuration());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Duration newElement = UMLFactory.eINSTANCE.createDuration();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Duration_2104(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Duration newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Duration;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class DurationCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public DurationCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDuration());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Duration newElement = UMLFactory.eINSTANCE.createDuration();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Duration_2104(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Duration newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationIntervalCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationIntervalCreateCommand.java
index 10a284b00ac..16b95cd2a7d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationIntervalCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationIntervalCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.DurationInterval;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class DurationIntervalCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public DurationIntervalCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationInterval());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		DurationInterval newElement = UMLFactory.eINSTANCE.createDurationInterval();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_DurationInterval_2106(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(DurationInterval newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.DurationInterval;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class DurationIntervalCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public DurationIntervalCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationInterval());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		DurationInterval newElement = UMLFactory.eINSTANCE.createDurationInterval();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_DurationInterval_2106(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(DurationInterval newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationCreateCommand.java
index 452d48e5cba..af33e1796b7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.DurationObservation;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class DurationObservationCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public DurationObservationCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationObservation());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		DurationObservation newElement = UMLFactory.eINSTANCE.createDurationObservation();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_DurationObservation_2093(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(DurationObservation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.DurationObservation;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class DurationObservationCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public DurationObservationCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getDurationObservation());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		DurationObservation newElement = UMLFactory.eINSTANCE.createDurationObservation();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_DurationObservation_2093(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(DurationObservation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationEventCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationEventCreateCommand.java
index dde78baa55c..d3726dbbefe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationEventCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationEventCreateCommand.java
@@ -1,101 +1,104 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.uml2.uml.DurationObservation;
-import org.eclipse.uml2.uml.NamedElement;
-
-/**
- * @generated
- */
-public class DurationObservationEventCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	protected final EObject source;
-	/**
-	 * @generated
-	 */
-	protected final EObject target;
-
-	/**
-	 * @generated
-	 */
-	public DurationObservationEventCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
-		super(request.getLabel(), null, request);
-		this.source = source;
-		this.target = target;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (source == null && target == null) {
-			return false;
-		}
-		if (source != null && false == source instanceof DurationObservation) {
-			return false;
-		}
-		if (target != null && false == target instanceof NamedElement) {
-			return false;
-		}
-		if (getSource() == null) {
-			return true; // link creation is in progress; source is not defined yet
-		}
-		// target may be null here but it's possible to check constraint
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateDurationObservationEvent_4019(getSource(), getTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
-		}
-		if (getSource() != null && getTarget() != null) {
-			getSource().getEvents()
-					.add(getTarget());
-		}
-		return CommandResult.newOKCommandResult();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setElementToEdit(EObject element) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DurationObservation getSource() {
-		return (DurationObservation) source;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getTarget() {
-		return (NamedElement) target;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.uml2.uml.DurationObservation;

+import org.eclipse.uml2.uml.NamedElement;

+

+/**

+ * @generated

+ */

+public class DurationObservationEventCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	protected final EObject source;

+

+	/**

+	 * @generated

+	 */

+	protected final EObject target;

+

+	/**

+	 * @generated

+	 */

+	public DurationObservationEventCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

+		super(request.getLabel(), null, request);

+		this.source = source;

+		this.target = target;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(source == null && target == null) {

+			return false;

+		}

+		if(source != null && false == source instanceof DurationObservation) {

+			return false;

+		}

+		if(target != null && false == target instanceof NamedElement) {

+			return false;

+		}

+		if(getSource() == null) {

+			return true; // link creation is in progress; source is not defined yet

+		}

+		// target may be null here but it's possible to check constraint

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateDurationObservationEvent_4019(getSource(), getTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

+		}

+

+		if(getSource() != null && getTarget() != null) {

+			getSource().getEvents().add(getTarget());

+		}

+		return CommandResult.newOKCommandResult();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setElementToEdit(EObject element) {

+		throw new UnsupportedOperationException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DurationObservation getSource() {

+		return (DurationObservation)source;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getTarget() {

+		return (NamedElement)target;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationEventReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationEventReorientCommand.java
index ebd0c86e671..cc6eeb221da 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationEventReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/DurationObservationEventReorientCommand.java
@@ -1,161 +1,159 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.uml2.uml.DurationObservation;
-import org.eclipse.uml2.uml.NamedElement;
-
-/**
- * @generated
- */
-public class DurationObservationEventReorientCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private final int reorientDirection;
-	/**
-	 * @generated
-	 */
-	private final EObject referenceOwner;
-	/**
-	 * @generated
-	 */
-	private final EObject oldEnd;
-	/**
-	 * @generated
-	 */
-	private final EObject newEnd;
-
-	/**
-	 * @generated
-	 */
-	public DurationObservationEventReorientCommand(ReorientReferenceRelationshipRequest request) {
-		super(request.getLabel(), null, request);
-		reorientDirection = request.getDirection();
-		referenceOwner = request.getReferenceOwner();
-		oldEnd = request.getOldRelationshipEnd();
-		newEnd = request.getNewRelationshipEnd();
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (false == referenceOwner instanceof DurationObservation) {
-			return false;
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return canReorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return canReorientTarget();
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientSource() {
-		if (!(oldEnd instanceof NamedElement && newEnd instanceof DurationObservation)) {
-			return false;
-		}
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDurationObservationEvent_4019(getNewSource(), getOldTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientTarget() {
-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
-			return false;
-		}
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDurationObservationEvent_4019(getOldSource(), getNewTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(
-			IProgressMonitor monitor, IAdaptable info)
-			throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return reorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return reorientTarget();
-		}
-		throw new IllegalStateException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientSource() throws ExecutionException {
-		getOldSource().getEvents()
-				.remove(getOldTarget());
-		getNewSource().getEvents()
-				.add(getOldTarget());
-		return CommandResult.newOKCommandResult(referenceOwner);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientTarget() throws ExecutionException {
-		getOldSource().getEvents()
-				.remove(getOldTarget());
-		getOldSource().getEvents()
-				.add(getNewTarget());
-		return CommandResult.newOKCommandResult(referenceOwner);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DurationObservation getOldSource() {
-		return (DurationObservation) referenceOwner;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DurationObservation getNewSource() {
-		return (DurationObservation) newEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getOldTarget() {
-		return (NamedElement) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getNewTarget() {
-		return (NamedElement) newEnd;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.uml2.uml.DurationObservation;

+import org.eclipse.uml2.uml.NamedElement;

+

+/**

+ * @generated

+ */

+public class DurationObservationEventReorientCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private final int reorientDirection;

+

+	/**

+	 * @generated

+	 */

+	private final EObject referenceOwner;

+

+	/**

+	 * @generated

+	 */

+	private final EObject oldEnd;

+

+	/**

+	 * @generated

+	 */

+	private final EObject newEnd;

+

+	/**

+	 * @generated

+	 */

+	public DurationObservationEventReorientCommand(ReorientReferenceRelationshipRequest request) {

+		super(request.getLabel(), null, request);

+		reorientDirection = request.getDirection();

+		referenceOwner = request.getReferenceOwner();

+		oldEnd = request.getOldRelationshipEnd();

+		newEnd = request.getNewRelationshipEnd();

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(false == referenceOwner instanceof DurationObservation) {

+			return false;

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return canReorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return canReorientTarget();

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientSource() {

+		if(!(oldEnd instanceof NamedElement && newEnd instanceof DurationObservation)) {

+			return false;

+		}

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDurationObservationEvent_4019(getNewSource(), getOldTarget());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientTarget() {

+		if(!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

+			return false;

+		}

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDurationObservationEvent_4019(getOldSource(), getNewTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return reorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return reorientTarget();

+		}

+		throw new IllegalStateException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientSource() throws ExecutionException {

+		getOldSource().getEvents().remove(getOldTarget());

+		getNewSource().getEvents().add(getOldTarget());

+		return CommandResult.newOKCommandResult(referenceOwner);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientTarget() throws ExecutionException {

+		getOldSource().getEvents().remove(getOldTarget());

+		getOldSource().getEvents().add(getNewTarget());

+		return CommandResult.newOKCommandResult(referenceOwner);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DurationObservation getOldSource() {

+		return (DurationObservation)referenceOwner;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DurationObservation getNewSource() {

+		return (DurationObservation)newEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getOldTarget() {

+		return (NamedElement)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getNewTarget() {

+		return (NamedElement)newEnd;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationCreateCommand.java
index 969677306ae..dc65fb8de8c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Enumeration;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class EnumerationCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public EnumerationCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getEnumeration());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Enumeration newElement = UMLFactory.eINSTANCE.createEnumeration();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Enumeration_2067(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Enumeration newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Enumeration;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class EnumerationCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public EnumerationCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getEnumeration());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Enumeration newElement = UMLFactory.eINSTANCE.createEnumeration();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Enumeration_2067(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Enumeration newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationCreateCommandCN.java
index a6617084e4c..c45abacf6af 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Enumeration;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class EnumerationCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public EnumerationCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getEnumeration());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Enumeration newElement = UMLFactory.eINSTANCE.createEnumeration();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Class qualifiedTarget = (Class) target;
-				qualifiedTarget.getNestedClassifiers()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Enumeration_3079(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Enumeration newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.Enumeration;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class EnumerationCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public EnumerationCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getEnumeration());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Enumeration newElement = UMLFactory.eINSTANCE.createEnumeration();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Class qualifiedTarget = (Class)target;

+				qualifiedTarget.getNestedClassifiers().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Enumeration_3079(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Enumeration newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationLiteralCreateCommandCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationLiteralCreateCommandCLN.java
index 7d00163826e..967f74004b0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationLiteralCreateCommandCLN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/EnumerationLiteralCreateCommandCLN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Enumeration;
-import org.eclipse.uml2.uml.EnumerationLiteral;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class EnumerationLiteralCreateCommandCLN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public EnumerationLiteralCreateCommandCLN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getEnumerationLiteral());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		EnumerationLiteral newElement = UMLFactory.eINSTANCE.createEnumerationLiteral();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Enumeration qualifiedTarget = (Enumeration) target;
-				qualifiedTarget.getOwnedLiterals()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_EnumerationLiteral_3066(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(EnumerationLiteral newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Enumeration;

+import org.eclipse.uml2.uml.EnumerationLiteral;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class EnumerationLiteralCreateCommandCLN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public EnumerationLiteralCreateCommandCLN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getEnumerationLiteral());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		EnumerationLiteral newElement = UMLFactory.eINSTANCE.createEnumerationLiteral();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Enumeration qualifiedTarget = (Enumeration)target;

+				qualifiedTarget.getOwnedLiterals().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_EnumerationLiteral_3066(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(EnumerationLiteral newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExecutionEnvironmentCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExecutionEnvironmentCompositeCreateCommand.java
index bc89e180272..22782148dce 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExecutionEnvironmentCompositeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExecutionEnvironmentCompositeCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.ExecutionEnvironment;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class ExecutionEnvironmentCompositeCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public ExecutionEnvironmentCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getExecutionEnvironment());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		ExecutionEnvironment newElement = UMLFactory.eINSTANCE.createExecutionEnvironment();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_ExecutionEnvironment_2071(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(ExecutionEnvironment newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.ExecutionEnvironment;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class ExecutionEnvironmentCompositeCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public ExecutionEnvironmentCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getExecutionEnvironment());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		ExecutionEnvironment newElement = UMLFactory.eINSTANCE.createExecutionEnvironment();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_ExecutionEnvironment_2071(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(ExecutionEnvironment newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExecutionEnvironmentCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExecutionEnvironmentCompositeCreateCommandCN.java
index 0da1c7f81a2..83bf1a293e3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExecutionEnvironmentCompositeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExecutionEnvironmentCompositeCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.ExecutionEnvironment;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class ExecutionEnvironmentCompositeCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public ExecutionEnvironmentCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getExecutionEnvironment());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		ExecutionEnvironment newElement = UMLFactory.eINSTANCE.createExecutionEnvironment();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Class qualifiedTarget = (Class) target;
-				qualifiedTarget.getNestedClassifiers()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_ExecutionEnvironment_3083(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(ExecutionEnvironment newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.ExecutionEnvironment;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class ExecutionEnvironmentCompositeCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public ExecutionEnvironmentCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getExecutionEnvironment());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		ExecutionEnvironment newElement = UMLFactory.eINSTANCE.createExecutionEnvironment();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Class qualifiedTarget = (Class)target;

+				qualifiedTarget.getNestedClassifiers().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_ExecutionEnvironment_3083(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(ExecutionEnvironment newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExpressionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExpressionCreateCommand.java
index 20e0f8d7d16..4eddbf0b8d3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExpressionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ExpressionCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Expression;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class ExpressionCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public ExpressionCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getExpression());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Expression newElement = UMLFactory.eINSTANCE.createExpression();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Expression_2103(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Expression newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Expression;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class ExpressionCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public ExpressionCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getExpression());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Expression newElement = UMLFactory.eINSTANCE.createExpression();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Expression_2103(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Expression newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/FunctionBehaviorCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/FunctionBehaviorCompositeCreateCommand.java
index c26e79f4411..82c52fefb29 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/FunctionBehaviorCompositeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/FunctionBehaviorCompositeCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.FunctionBehavior;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class FunctionBehaviorCompositeCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public FunctionBehaviorCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getFunctionBehavior());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		FunctionBehavior newElement = UMLFactory.eINSTANCE.createFunctionBehavior();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_FunctionBehavior_2064(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(FunctionBehavior newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.FunctionBehavior;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class FunctionBehaviorCompositeCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public FunctionBehaviorCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getFunctionBehavior());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		FunctionBehavior newElement = UMLFactory.eINSTANCE.createFunctionBehavior();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_FunctionBehavior_2064(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(FunctionBehavior newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/FunctionBehaviorCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/FunctionBehaviorCompositeCreateCommandCN.java
index 321d8eff5c9..b49385947d3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/FunctionBehaviorCompositeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/FunctionBehaviorCompositeCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.FunctionBehavior;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class FunctionBehaviorCompositeCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public FunctionBehaviorCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getFunctionBehavior());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		FunctionBehavior newElement = UMLFactory.eINSTANCE.createFunctionBehavior();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Class qualifiedTarget = (Class) target;
-				qualifiedTarget.getNestedClassifiers()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_FunctionBehavior_3076(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(FunctionBehavior newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.FunctionBehavior;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class FunctionBehaviorCompositeCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public FunctionBehaviorCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getFunctionBehavior());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		FunctionBehavior newElement = UMLFactory.eINSTANCE.createFunctionBehavior();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Class qualifiedTarget = (Class)target;

+				qualifiedTarget.getNestedClassifiers().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_FunctionBehavior_3076(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(FunctionBehavior newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/GeneralizationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/GeneralizationCreateCommand.java
index 990840fbaa1..78c8548c0dd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/GeneralizationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/GeneralizationCreateCommand.java
@@ -1,161 +1,162 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.uml2.uml.Classifier;
-import org.eclipse.uml2.uml.Generalization;
-import org.eclipse.uml2.uml.UMLFactory;
-
-/**
- * @generated
- */
-public class GeneralizationCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	protected final EObject source;
-	/**
-	 * @generated
-	 */
-	protected final EObject target;
-	/**
-	 * @generated
-	 */
-	protected Classifier container;
-
-	/**
-	 * @generated
-	 */
-	public GeneralizationCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
-		super(request.getLabel(), null, request);
-		this.source = source;
-		this.target = target;
-		container = deduceContainer(source, target);
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (source == null && target == null) {
-			return false;
-		}
-		if (source != null && false == source instanceof Classifier) {
-			return false;
-		}
-		if (target != null && false == target instanceof Classifier) {
-			return false;
-		}
-		if (getSource() == null) {
-			return true; // link creation is in progress; source is not defined yet
-		}
-		// target may be null here but it's possible to check constraint
-		if (getContainer() == null) {
-			return false;
-		}
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateGeneralization_4015(getContainer(), getSource(), getTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
-		}
-		Generalization newElement = UMLFactory.eINSTANCE.createGeneralization();
-		getContainer().getGeneralizations()
-				.add(newElement);
-		newElement.setSpecific(
-				getSource()
-				);
-		newElement.setGeneral(
-				getTarget()
-				);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Generalization newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());
-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setElementToEdit(EObject element) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Classifier getSource() {
-		return (Classifier) source;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Classifier getTarget() {
-		return (Classifier) target;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Classifier getContainer() {
-		return container;
-	}
-
-	/**
-	 * Default approach is to traverse ancestors of the source to find instance of container.
-	 * Modify with appropriate logic.
-	 * @generated
-	 */
-	protected Classifier deduceContainer(EObject source, EObject target) {
-		// Find container element for the new link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null; element = element.eContainer()) {
-			if (element instanceof Classifier) {
-				return (Classifier) element;
-			}
-		}
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.uml2.uml.Classifier;

+import org.eclipse.uml2.uml.Generalization;

+import org.eclipse.uml2.uml.UMLFactory;

+

+/**

+ * @generated

+ */

+public class GeneralizationCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	protected final EObject source;

+

+	/**

+	 * @generated

+	 */

+	protected final EObject target;

+

+	/**

+	 * @generated

+	 */

+	protected Classifier container;

+

+	/**

+	 * @generated

+	 */

+	public GeneralizationCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

+		super(request.getLabel(), null, request);

+		this.source = source;

+		this.target = target;

+		container = deduceContainer(source, target);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(source == null && target == null) {

+			return false;

+		}

+		if(source != null && false == source instanceof Classifier) {

+			return false;

+		}

+		if(target != null && false == target instanceof Classifier) {

+			return false;

+		}

+		if(getSource() == null) {

+			return true; // link creation is in progress; source is not defined yet

+		}

+		// target may be null here but it's possible to check constraint

+		if(getContainer() == null) {

+			return false;

+		}

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateGeneralization_4015(getContainer(), getSource(), getTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

+		}

+

+		Generalization newElement = UMLFactory.eINSTANCE.createGeneralization();

+		getContainer().getGeneralizations().add(newElement);

+		newElement.setSpecific(getSource());

+		newElement.setGeneral(getTarget());

+		doConfigure(newElement, monitor, info);

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Generalization newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

+		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setElementToEdit(EObject element) {

+		throw new UnsupportedOperationException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Classifier getSource() {

+		return (Classifier)source;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Classifier getTarget() {

+		return (Classifier)target;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Classifier getContainer() {

+		return container;

+	}

+

+	/**

+	 * Default approach is to traverse ancestors of the source to find instance of container.

+	 * Modify with appropriate logic.

+	 * 

+	 * @generated

+	 */

+	protected Classifier deduceContainer(EObject source, EObject target) {

+		// Find container element for the new link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null; element = element.eContainer()) {

+			if(element instanceof Classifier) {

+				return (Classifier)element;

+			}

+		}

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/GeneralizationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/GeneralizationReorientCommand.java
index 43a9a412f7f..ee7e1b0a151 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/GeneralizationReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/GeneralizationReorientCommand.java
@@ -1,170 +1,167 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.uml2.uml.Classifier;
-import org.eclipse.uml2.uml.Generalization;
-
-/**
- * @generated
- */
-public class GeneralizationReorientCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private final int reorientDirection;
-	/**
-	 * @generated
-	 */
-	private final EObject oldEnd;
-	/**
-	 * @generated
-	 */
-	private final EObject newEnd;
-
-	/**
-	 * @generated
-	 */
-	public GeneralizationReorientCommand(ReorientRelationshipRequest request) {
-		super(request.getLabel(), request.getRelationship(), request);
-		reorientDirection = request.getDirection();
-		oldEnd = request.getOldRelationshipEnd();
-		newEnd = request.getNewRelationshipEnd();
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (false == getElementToEdit() instanceof Generalization) {
-			return false;
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return canReorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return canReorientTarget();
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientSource() {
-		if (!(oldEnd instanceof Classifier && newEnd instanceof Classifier)) {
-			return false;
-		}
-		Classifier target = getLink().getGeneral();
-		if (!(getLink().eContainer() instanceof Classifier)) {
-			return false;
-		}
-		Classifier container = (Classifier) getLink().eContainer();
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistGeneralization_4015(container, getLink(), getNewSource(), target);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientTarget() {
-		if (!(oldEnd instanceof Classifier && newEnd instanceof Classifier)) {
-			return false;
-		}
-		Classifier source = getLink().getSpecific();
-		if (!(getLink().eContainer() instanceof Classifier)) {
-			return false;
-		}
-		Classifier container = (Classifier) getLink().eContainer();
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistGeneralization_4015(container, getLink(), source, getNewTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(
-			IProgressMonitor monitor, IAdaptable info)
-			throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return reorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return reorientTarget();
-		}
-		throw new IllegalStateException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientSource() throws ExecutionException {
-		getLink().setSpecific(
-				getNewSource()
-				);
-		return CommandResult.newOKCommandResult(getLink());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientTarget() throws ExecutionException {
-		getLink().setGeneral(
-				getNewTarget()
-				);
-		return CommandResult.newOKCommandResult(getLink());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Generalization getLink() {
-		return (Generalization) getElementToEdit();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Classifier getOldSource() {
-		return (Classifier) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Classifier getNewSource() {
-		return (Classifier) newEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Classifier getOldTarget() {
-		return (Classifier) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Classifier getNewTarget() {
-		return (Classifier) newEnd;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.uml2.uml.Classifier;

+import org.eclipse.uml2.uml.Generalization;

+

+/**

+ * @generated

+ */

+public class GeneralizationReorientCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private final int reorientDirection;

+

+	/**

+	 * @generated

+	 */

+	private final EObject oldEnd;

+

+	/**

+	 * @generated

+	 */

+	private final EObject newEnd;

+

+	/**

+	 * @generated

+	 */

+	public GeneralizationReorientCommand(ReorientRelationshipRequest request) {

+		super(request.getLabel(), request.getRelationship(), request);

+		reorientDirection = request.getDirection();

+		oldEnd = request.getOldRelationshipEnd();

+		newEnd = request.getNewRelationshipEnd();

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(false == getElementToEdit() instanceof Generalization) {

+			return false;

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return canReorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return canReorientTarget();

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientSource() {

+		if(!(oldEnd instanceof Classifier && newEnd instanceof Classifier)) {

+			return false;

+		}

+		Classifier target = getLink().getGeneral();

+		if(!(getLink().eContainer() instanceof Classifier)) {

+			return false;

+		}

+		Classifier container = (Classifier)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistGeneralization_4015(container, getLink(), getNewSource(), target);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientTarget() {

+		if(!(oldEnd instanceof Classifier && newEnd instanceof Classifier)) {

+			return false;

+		}

+		Classifier source = getLink().getSpecific();

+		if(!(getLink().eContainer() instanceof Classifier)) {

+			return false;

+		}

+		Classifier container = (Classifier)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistGeneralization_4015(container, getLink(), source, getNewTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return reorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return reorientTarget();

+		}

+		throw new IllegalStateException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientSource() throws ExecutionException {

+		getLink().setSpecific(getNewSource());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientTarget() throws ExecutionException {

+		getLink().setGeneral(getNewTarget());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Generalization getLink() {

+		return (Generalization)getElementToEdit();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Classifier getOldSource() {

+		return (Classifier)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Classifier getNewSource() {

+		return (Classifier)newEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Classifier getOldTarget() {

+		return (Classifier)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Classifier getNewTarget() {

+		return (Classifier)newEnd;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationFlowCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationFlowCreateCommand.java
index 220f5c58a29..b918cdca78d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationFlowCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationFlowCreateCommand.java
@@ -1,162 +1,165 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.InformationFlow;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-
-/**
- * @generated
- */
-public class InformationFlowCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	protected final EObject source;
-	/**
-	 * @generated
-	 */
-	protected final EObject target;
-	/**
-	 * @generated
-	 */
-	protected Package container;
-
-	/**
-	 * @generated
-	 */
-	public InformationFlowCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
-		super(request.getLabel(), null, request);
-		this.source = source;
-		this.target = target;
-		container = deduceContainer(source, target);
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (source == null && target == null) {
-			return false;
-		}
-		if (source != null && false == source instanceof NamedElement) {
-			return false;
-		}
-		if (target != null && false == target instanceof NamedElement) {
-			return false;
-		}
-		if (getSource() == null) {
-			return true; // link creation is in progress; source is not defined yet
-		}
-		// target may be null here but it's possible to check constraint
-		if (getContainer() == null) {
-			return false;
-		}
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateInformationFlow_4021(getContainer(), getSource(), getTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
-		}
-		InformationFlow newElement = UMLFactory.eINSTANCE.createInformationFlow();
-		getContainer().getPackagedElements()
-				.add(newElement);
-		newElement.getInformationSources()
-				.add(getSource());
-		newElement.getInformationTargets()
-				.add(getTarget());
-		ElementInitializers.getInstance().init_InformationFlow_4021(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(InformationFlow newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());
-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setElementToEdit(EObject element) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getSource() {
-		return (NamedElement) source;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getTarget() {
-		return (NamedElement) target;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Package getContainer() {
-		return container;
-	}
-
-	/**
-	 * Default approach is to traverse ancestors of the source to find instance of container.
-	 * Modify with appropriate logic.
-	 * @generated
-	 */
-	protected Package deduceContainer(EObject source, EObject target) {
-		// Find container element for the new link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				return (Package) element;
-			}
-		}
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.InformationFlow;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+

+/**

+ * @generated

+ */

+public class InformationFlowCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	protected final EObject source;

+

+	/**

+	 * @generated

+	 */

+	protected final EObject target;

+

+	/**

+	 * @generated

+	 */

+	protected Package container;

+

+	/**

+	 * @generated

+	 */

+	public InformationFlowCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

+		super(request.getLabel(), null, request);

+		this.source = source;

+		this.target = target;

+		container = deduceContainer(source, target);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(source == null && target == null) {

+			return false;

+		}

+		if(source != null && false == source instanceof NamedElement) {

+			return false;

+		}

+		if(target != null && false == target instanceof NamedElement) {

+			return false;

+		}

+		if(getSource() == null) {

+			return true; // link creation is in progress; source is not defined yet

+		}

+		// target may be null here but it's possible to check constraint

+		if(getContainer() == null) {

+			return false;

+		}

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateInformationFlow_4021(getContainer(), getSource(), getTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

+		}

+

+		InformationFlow newElement = UMLFactory.eINSTANCE.createInformationFlow();

+		getContainer().getPackagedElements().add(newElement);

+		newElement.getInformationSources().add(getSource());

+		newElement.getInformationTargets().add(getTarget());

+		ElementInitializers.getInstance().init_InformationFlow_4021(newElement);

+		doConfigure(newElement, monitor, info);

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(InformationFlow newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

+		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setElementToEdit(EObject element) {

+		throw new UnsupportedOperationException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getSource() {

+		return (NamedElement)source;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getTarget() {

+		return (NamedElement)target;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Package getContainer() {

+		return container;

+	}

+

+	/**

+	 * Default approach is to traverse ancestors of the source to find instance of container.

+	 * Modify with appropriate logic.

+	 * 

+	 * @generated

+	 */

+	protected Package deduceContainer(EObject source, EObject target) {

+		// Find container element for the new link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				return (Package)element;

+			}

+		}

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationFlowReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationFlowReorientCommand.java
index 72ede3c2907..d7e95d005f7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationFlowReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationFlowReorientCommand.java
@@ -1,183 +1,176 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.uml2.uml.InformationFlow;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-
-/**
- * @generated
- */
-public class InformationFlowReorientCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private final int reorientDirection;
-	/**
-	 * @generated
-	 */
-	private final EObject oldEnd;
-	/**
-	 * @generated
-	 */
-	private final EObject newEnd;
-
-	/**
-	 * @generated
-	 */
-	public InformationFlowReorientCommand(ReorientRelationshipRequest request) {
-		super(request.getLabel(), request.getRelationship(), request);
-		reorientDirection = request.getDirection();
-		oldEnd = request.getOldRelationshipEnd();
-		newEnd = request.getNewRelationshipEnd();
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (false == getElementToEdit() instanceof InformationFlow) {
-			return false;
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return canReorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return canReorientTarget();
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientSource() {
-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
-			return false;
-		}
-		if (getLink().getInformationTargets()
-				.size() != 1) {
-			return false;
-		}
-		NamedElement target = (NamedElement) getLink().getInformationTargets()
-				.get(0);
-		if (!(getLink().eContainer() instanceof Package)) {
-			return false;
-		}
-		Package container = (Package) getLink().eContainer();
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistInformationFlow_4021(container, getLink(), getNewSource(), target);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientTarget() {
-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
-			return false;
-		}
-		if (getLink().getInformationSources()
-				.size() != 1) {
-			return false;
-		}
-		NamedElement source = (NamedElement) getLink().getInformationSources()
-				.get(0);
-		if (!(getLink().eContainer() instanceof Package)) {
-			return false;
-		}
-		Package container = (Package) getLink().eContainer();
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistInformationFlow_4021(container, getLink(), source, getNewTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(
-			IProgressMonitor monitor, IAdaptable info)
-			throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return reorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return reorientTarget();
-		}
-		throw new IllegalStateException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientSource() throws ExecutionException {
-		getLink().getInformationSources()
-				.remove(getOldSource());
-		getLink().getInformationSources()
-				.add(getNewSource());
-		return CommandResult.newOKCommandResult(getLink());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientTarget() throws ExecutionException {
-		getLink().getInformationTargets()
-				.remove(getOldTarget());
-		getLink().getInformationTargets()
-				.add(getNewTarget());
-		return CommandResult.newOKCommandResult(getLink());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected InformationFlow getLink() {
-		return (InformationFlow) getElementToEdit();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getOldSource() {
-		return (NamedElement) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getNewSource() {
-		return (NamedElement) newEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getOldTarget() {
-		return (NamedElement) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getNewTarget() {
-		return (NamedElement) newEnd;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.uml2.uml.InformationFlow;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Package;

+

+/**

+ * @generated

+ */

+public class InformationFlowReorientCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private final int reorientDirection;

+

+	/**

+	 * @generated

+	 */

+	private final EObject oldEnd;

+

+	/**

+	 * @generated

+	 */

+	private final EObject newEnd;

+

+	/**

+	 * @generated

+	 */

+	public InformationFlowReorientCommand(ReorientRelationshipRequest request) {

+		super(request.getLabel(), request.getRelationship(), request);

+		reorientDirection = request.getDirection();

+		oldEnd = request.getOldRelationshipEnd();

+		newEnd = request.getNewRelationshipEnd();

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(false == getElementToEdit() instanceof InformationFlow) {

+			return false;

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return canReorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return canReorientTarget();

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientSource() {

+		if(!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

+			return false;

+		}

+		if(getLink().getInformationTargets().size() != 1) {

+			return false;

+		}

+		NamedElement target = (NamedElement)getLink().getInformationTargets().get(0);

+		if(!(getLink().eContainer() instanceof Package)) {

+			return false;

+		}

+		Package container = (Package)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistInformationFlow_4021(container, getLink(), getNewSource(), target);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientTarget() {

+		if(!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

+			return false;

+		}

+		if(getLink().getInformationSources().size() != 1) {

+			return false;

+		}

+		NamedElement source = (NamedElement)getLink().getInformationSources().get(0);

+		if(!(getLink().eContainer() instanceof Package)) {

+			return false;

+		}

+		Package container = (Package)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistInformationFlow_4021(container, getLink(), source, getNewTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return reorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return reorientTarget();

+		}

+		throw new IllegalStateException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientSource() throws ExecutionException {

+		getLink().getInformationSources().remove(getOldSource());

+		getLink().getInformationSources().add(getNewSource());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientTarget() throws ExecutionException {

+		getLink().getInformationTargets().remove(getOldTarget());

+		getLink().getInformationTargets().add(getNewTarget());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected InformationFlow getLink() {

+		return (InformationFlow)getElementToEdit();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getOldSource() {

+		return (NamedElement)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getNewSource() {

+		return (NamedElement)newEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getOldTarget() {

+		return (NamedElement)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getNewTarget() {

+		return (NamedElement)newEnd;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationItemCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationItemCreateCommand.java
index 10912e02b87..b84be4bc84a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationItemCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationItemCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.InformationItem;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class InformationItemCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public InformationItemCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInformationItem());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		InformationItem newElement = UMLFactory.eINSTANCE.createInformationItem();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_InformationItem_2080(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(InformationItem newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.InformationItem;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class InformationItemCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public InformationItemCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInformationItem());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		InformationItem newElement = UMLFactory.eINSTANCE.createInformationItem();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_InformationItem_2080(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(InformationItem newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationItemCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationItemCreateCommandCN.java
index c5824520726..c9e6ac3a01a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationItemCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InformationItemCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.InformationItem;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class InformationItemCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public InformationItemCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInformationItem());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		InformationItem newElement = UMLFactory.eINSTANCE.createInformationItem();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Class qualifiedTarget = (Class) target;
-				qualifiedTarget.getNestedClassifiers()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_InformationItem_3094(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(InformationItem newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.InformationItem;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class InformationItemCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public InformationItemCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInformationItem());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		InformationItem newElement = UMLFactory.eINSTANCE.createInformationItem();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Class qualifiedTarget = (Class)target;

+				qualifiedTarget.getNestedClassifiers().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_InformationItem_3094(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(InformationItem newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InstanceValueCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InstanceValueCreateCommand.java
index ba7aba4a1c5..7bb34d6de70 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InstanceValueCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InstanceValueCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.InstanceValue;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class InstanceValueCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public InstanceValueCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInstanceValue());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		InstanceValue newElement = UMLFactory.eINSTANCE.createInstanceValue();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_InstanceValue_2108(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(InstanceValue newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.InstanceValue;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class InstanceValueCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public InstanceValueCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInstanceValue());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		InstanceValue newElement = UMLFactory.eINSTANCE.createInstanceValue();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_InstanceValue_2108(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(InstanceValue newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionCompositeCreateCommand.java
index 6fbe3be98c4..dd6b8ec0820 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionCompositeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionCompositeCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Interaction;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class InteractionCompositeCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public InteractionCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInteraction());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Interaction newElement = UMLFactory.eINSTANCE.createInteraction();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Interaction_2061(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Interaction newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Interaction;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class InteractionCompositeCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public InteractionCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInteraction());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Interaction newElement = UMLFactory.eINSTANCE.createInteraction();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Interaction_2061(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Interaction newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionCompositeCreateCommandCN.java
index ccad1676fea..89a581b7192 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionCompositeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionCompositeCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Interaction;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class InteractionCompositeCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public InteractionCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInteraction());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Interaction newElement = UMLFactory.eINSTANCE.createInteraction();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Class qualifiedTarget = (Class) target;
-				qualifiedTarget.getNestedClassifiers()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Interaction_3073(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Interaction newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.Interaction;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class InteractionCompositeCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public InteractionCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInteraction());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Interaction newElement = UMLFactory.eINSTANCE.createInteraction();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Class qualifiedTarget = (Class)target;

+				qualifiedTarget.getNestedClassifiers().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Interaction_3073(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Interaction newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionConstraintCreateCommand.java
index fd0e701ba25..4f322358831 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionConstraintCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionConstraintCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.InteractionConstraint;
-import org.eclipse.uml2.uml.Namespace;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class InteractionConstraintCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public InteractionConstraintCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInteractionConstraint());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		InteractionConstraint newElement = UMLFactory.eINSTANCE.createInteractionConstraint();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Namespace qualifiedTarget = (Namespace) target;
-				qualifiedTarget.getOwnedRules()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_InteractionConstraint_2113(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(InteractionConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.InteractionConstraint;

+import org.eclipse.uml2.uml.Namespace;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class InteractionConstraintCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public InteractionConstraintCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInteractionConstraint());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		InteractionConstraint newElement = UMLFactory.eINSTANCE.createInteractionConstraint();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Namespace qualifiedTarget = (Namespace)target;

+				qualifiedTarget.getOwnedRules().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_InteractionConstraint_2113(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(InteractionConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionConstraintCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionConstraintCreateCommandCN.java
index b9d0f39f40d..bb3fd888d21 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionConstraintCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InteractionConstraintCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.InteractionConstraint;
-import org.eclipse.uml2.uml.Namespace;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class InteractionConstraintCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public InteractionConstraintCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInteractionConstraint());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		InteractionConstraint newElement = UMLFactory.eINSTANCE.createInteractionConstraint();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Namespace qualifiedTarget = (Namespace) target;
-				qualifiedTarget.getOwnedRules()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_InteractionConstraint_3119(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(InteractionConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.InteractionConstraint;

+import org.eclipse.uml2.uml.Namespace;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class InteractionConstraintCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public InteractionConstraintCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInteractionConstraint());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		InteractionConstraint newElement = UMLFactory.eINSTANCE.createInteractionConstraint();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Namespace qualifiedTarget = (Namespace)target;

+				qualifiedTarget.getOwnedRules().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_InteractionConstraint_3119(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(InteractionConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceCreateCommand.java
index 45e9f6f0846..bc9ed4946a0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Interface;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class InterfaceCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public InterfaceCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInterface());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Interface newElement = UMLFactory.eINSTANCE.createInterface();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Interface_2076(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Interface newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Interface;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class InterfaceCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public InterfaceCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInterface());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Interface newElement = UMLFactory.eINSTANCE.createInterface();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Interface_2076(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Interface newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceCreateCommandCN.java
index 2a6904997c1..3872de15739 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Interface;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class InterfaceCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public InterfaceCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInterface());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Interface newElement = UMLFactory.eINSTANCE.createInterface();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Class qualifiedTarget = (Class) target;
-				qualifiedTarget.getNestedClassifiers()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Interface_3087(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Interface newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.Interface;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class InterfaceCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public InterfaceCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInterface());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Interface newElement = UMLFactory.eINSTANCE.createInterface();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Class qualifiedTarget = (Class)target;

+				qualifiedTarget.getNestedClassifiers().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Interface_3087(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Interface newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceRealizationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceRealizationCreateCommand.java
index 0b2a2d525f3..cfb592b0d24 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceRealizationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceRealizationCreateCommand.java
@@ -1,162 +1,165 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.InterfaceRealization;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-
-/**
- * @generated
- */
-public class InterfaceRealizationCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	protected final EObject source;
-	/**
-	 * @generated
-	 */
-	protected final EObject target;
-	/**
-	 * @generated
-	 */
-	protected Package container;
-
-	/**
-	 * @generated
-	 */
-	public InterfaceRealizationCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
-		super(request.getLabel(), null, request);
-		this.source = source;
-		this.target = target;
-		container = deduceContainer(source, target);
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (source == null && target == null) {
-			return false;
-		}
-		if (source != null && false == source instanceof NamedElement) {
-			return false;
-		}
-		if (target != null && false == target instanceof NamedElement) {
-			return false;
-		}
-		if (getSource() == null) {
-			return true; // link creation is in progress; source is not defined yet
-		}
-		// target may be null here but it's possible to check constraint
-		if (getContainer() == null) {
-			return false;
-		}
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateInterfaceRealization_4005(getContainer(), getSource(), getTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
-		}
-		InterfaceRealization newElement = UMLFactory.eINSTANCE.createInterfaceRealization();
-		getContainer().getPackagedElements()
-				.add(newElement);
-		newElement.getClients()
-				.add(getSource());
-		newElement.getSuppliers()
-				.add(getTarget());
-		ElementInitializers.getInstance().init_InterfaceRealization_4005(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(InterfaceRealization newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());
-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setElementToEdit(EObject element) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getSource() {
-		return (NamedElement) source;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getTarget() {
-		return (NamedElement) target;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Package getContainer() {
-		return container;
-	}
-
-	/**
-	 * Default approach is to traverse ancestors of the source to find instance of container.
-	 * Modify with appropriate logic.
-	 * @generated
-	 */
-	protected Package deduceContainer(EObject source, EObject target) {
-		// Find container element for the new link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				return (Package) element;
-			}
-		}
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.InterfaceRealization;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+

+/**

+ * @generated

+ */

+public class InterfaceRealizationCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	protected final EObject source;

+

+	/**

+	 * @generated

+	 */

+	protected final EObject target;

+

+	/**

+	 * @generated

+	 */

+	protected Package container;

+

+	/**

+	 * @generated

+	 */

+	public InterfaceRealizationCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

+		super(request.getLabel(), null, request);

+		this.source = source;

+		this.target = target;

+		container = deduceContainer(source, target);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(source == null && target == null) {

+			return false;

+		}

+		if(source != null && false == source instanceof NamedElement) {

+			return false;

+		}

+		if(target != null && false == target instanceof NamedElement) {

+			return false;

+		}

+		if(getSource() == null) {

+			return true; // link creation is in progress; source is not defined yet

+		}

+		// target may be null here but it's possible to check constraint

+		if(getContainer() == null) {

+			return false;

+		}

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateInterfaceRealization_4005(getContainer(), getSource(), getTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

+		}

+

+		InterfaceRealization newElement = UMLFactory.eINSTANCE.createInterfaceRealization();

+		getContainer().getPackagedElements().add(newElement);

+		newElement.getClients().add(getSource());

+		newElement.getSuppliers().add(getTarget());

+		ElementInitializers.getInstance().init_InterfaceRealization_4005(newElement);

+		doConfigure(newElement, monitor, info);

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(InterfaceRealization newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

+		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setElementToEdit(EObject element) {

+		throw new UnsupportedOperationException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getSource() {

+		return (NamedElement)source;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getTarget() {

+		return (NamedElement)target;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Package getContainer() {

+		return container;

+	}

+

+	/**

+	 * Default approach is to traverse ancestors of the source to find instance of container.

+	 * Modify with appropriate logic.

+	 * 

+	 * @generated

+	 */

+	protected Package deduceContainer(EObject source, EObject target) {

+		// Find container element for the new link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				return (Package)element;

+			}

+		}

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceRealizationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceRealizationReorientCommand.java
index 86ec31ad587..8e7f443dc3e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceRealizationReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/InterfaceRealizationReorientCommand.java
@@ -1,183 +1,176 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.uml2.uml.InterfaceRealization;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-
-/**
- * @generated
- */
-public class InterfaceRealizationReorientCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private final int reorientDirection;
-	/**
-	 * @generated
-	 */
-	private final EObject oldEnd;
-	/**
-	 * @generated
-	 */
-	private final EObject newEnd;
-
-	/**
-	 * @generated
-	 */
-	public InterfaceRealizationReorientCommand(ReorientRelationshipRequest request) {
-		super(request.getLabel(), request.getRelationship(), request);
-		reorientDirection = request.getDirection();
-		oldEnd = request.getOldRelationshipEnd();
-		newEnd = request.getNewRelationshipEnd();
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (false == getElementToEdit() instanceof InterfaceRealization) {
-			return false;
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return canReorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return canReorientTarget();
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientSource() {
-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
-			return false;
-		}
-		if (getLink().getSuppliers()
-				.size() != 1) {
-			return false;
-		}
-		NamedElement target = (NamedElement) getLink().getSuppliers()
-				.get(0);
-		if (!(getLink().eContainer() instanceof Package)) {
-			return false;
-		}
-		Package container = (Package) getLink().eContainer();
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistInterfaceRealization_4005(container, getLink(), getNewSource(), target);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientTarget() {
-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
-			return false;
-		}
-		if (getLink().getClients()
-				.size() != 1) {
-			return false;
-		}
-		NamedElement source = (NamedElement) getLink().getClients()
-				.get(0);
-		if (!(getLink().eContainer() instanceof Package)) {
-			return false;
-		}
-		Package container = (Package) getLink().eContainer();
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistInterfaceRealization_4005(container, getLink(), source, getNewTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(
-			IProgressMonitor monitor, IAdaptable info)
-			throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return reorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return reorientTarget();
-		}
-		throw new IllegalStateException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientSource() throws ExecutionException {
-		getLink().getClients()
-				.remove(getOldSource());
-		getLink().getClients()
-				.add(getNewSource());
-		return CommandResult.newOKCommandResult(getLink());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientTarget() throws ExecutionException {
-		getLink().getSuppliers()
-				.remove(getOldTarget());
-		getLink().getSuppliers()
-				.add(getNewTarget());
-		return CommandResult.newOKCommandResult(getLink());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected InterfaceRealization getLink() {
-		return (InterfaceRealization) getElementToEdit();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getOldSource() {
-		return (NamedElement) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getNewSource() {
-		return (NamedElement) newEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getOldTarget() {
-		return (NamedElement) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getNewTarget() {
-		return (NamedElement) newEnd;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.uml2.uml.InterfaceRealization;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Package;

+

+/**

+ * @generated

+ */

+public class InterfaceRealizationReorientCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private final int reorientDirection;

+

+	/**

+	 * @generated

+	 */

+	private final EObject oldEnd;

+

+	/**

+	 * @generated

+	 */

+	private final EObject newEnd;

+

+	/**

+	 * @generated

+	 */

+	public InterfaceRealizationReorientCommand(ReorientRelationshipRequest request) {

+		super(request.getLabel(), request.getRelationship(), request);

+		reorientDirection = request.getDirection();

+		oldEnd = request.getOldRelationshipEnd();

+		newEnd = request.getNewRelationshipEnd();

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(false == getElementToEdit() instanceof InterfaceRealization) {

+			return false;

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return canReorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return canReorientTarget();

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientSource() {

+		if(!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

+			return false;

+		}

+		if(getLink().getSuppliers().size() != 1) {

+			return false;

+		}

+		NamedElement target = (NamedElement)getLink().getSuppliers().get(0);

+		if(!(getLink().eContainer() instanceof Package)) {

+			return false;

+		}

+		Package container = (Package)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistInterfaceRealization_4005(container, getLink(), getNewSource(), target);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientTarget() {

+		if(!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

+			return false;

+		}

+		if(getLink().getClients().size() != 1) {

+			return false;

+		}

+		NamedElement source = (NamedElement)getLink().getClients().get(0);

+		if(!(getLink().eContainer() instanceof Package)) {

+			return false;

+		}

+		Package container = (Package)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistInterfaceRealization_4005(container, getLink(), source, getNewTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return reorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return reorientTarget();

+		}

+		throw new IllegalStateException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientSource() throws ExecutionException {

+		getLink().getClients().remove(getOldSource());

+		getLink().getClients().add(getNewSource());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientTarget() throws ExecutionException {

+		getLink().getSuppliers().remove(getOldTarget());

+		getLink().getSuppliers().add(getNewTarget());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected InterfaceRealization getLink() {

+		return (InterfaceRealization)getElementToEdit();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getOldSource() {

+		return (NamedElement)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getNewSource() {

+		return (NamedElement)newEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getOldTarget() {

+		return (NamedElement)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getNewTarget() {

+		return (NamedElement)newEnd;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalConstraintCreateCommand.java
index 9e016404ad5..e11bed5d0e4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalConstraintCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalConstraintCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.IntervalConstraint;
-import org.eclipse.uml2.uml.Namespace;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class IntervalConstraintCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public IntervalConstraintCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getIntervalConstraint());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IntervalConstraint newElement = UMLFactory.eINSTANCE.createIntervalConstraint();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Namespace qualifiedTarget = (Namespace) target;
-				qualifiedTarget.getOwnedRules()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_IntervalConstraint_2112(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(IntervalConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.IntervalConstraint;

+import org.eclipse.uml2.uml.Namespace;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class IntervalConstraintCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public IntervalConstraintCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getIntervalConstraint());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		IntervalConstraint newElement = UMLFactory.eINSTANCE.createIntervalConstraint();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Namespace qualifiedTarget = (Namespace)target;

+				qualifiedTarget.getOwnedRules().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_IntervalConstraint_2112(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(IntervalConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalConstraintCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalConstraintCreateCommandCN.java
index 887c0760083..1d802aaff5b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalConstraintCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalConstraintCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.IntervalConstraint;
-import org.eclipse.uml2.uml.Namespace;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class IntervalConstraintCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public IntervalConstraintCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getIntervalConstraint());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IntervalConstraint newElement = UMLFactory.eINSTANCE.createIntervalConstraint();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Namespace qualifiedTarget = (Namespace) target;
-				qualifiedTarget.getOwnedRules()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_IntervalConstraint_3118(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(IntervalConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.IntervalConstraint;

+import org.eclipse.uml2.uml.Namespace;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class IntervalConstraintCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public IntervalConstraintCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getIntervalConstraint());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		IntervalConstraint newElement = UMLFactory.eINSTANCE.createIntervalConstraint();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Namespace qualifiedTarget = (Namespace)target;

+				qualifiedTarget.getOwnedRules().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_IntervalConstraint_3118(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(IntervalConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalCreateCommand.java
index 6c915ff22bd..60062d72830 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/IntervalCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Interval;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class IntervalCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public IntervalCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInterval());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Interval newElement = UMLFactory.eINSTANCE.createInterval();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Interval_2107(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Interval newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Interval;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class IntervalCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public IntervalCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getInterval());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Interval newElement = UMLFactory.eINSTANCE.createInterval();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Interval_2107(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Interval newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralBooleanCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralBooleanCreateCommand.java
index 4fb04a22af4..5a852593f0e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralBooleanCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralBooleanCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.LiteralBoolean;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class LiteralBooleanCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public LiteralBooleanCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLiteralBoolean());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		LiteralBoolean newElement = UMLFactory.eINSTANCE.createLiteralBoolean();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_LiteralBoolean_2095(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(LiteralBoolean newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.LiteralBoolean;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class LiteralBooleanCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public LiteralBooleanCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLiteralBoolean());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		LiteralBoolean newElement = UMLFactory.eINSTANCE.createLiteralBoolean();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_LiteralBoolean_2095(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(LiteralBoolean newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralIntegerCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralIntegerCreateCommand.java
index e97df1b3fa8..950f66494be 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralIntegerCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralIntegerCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.LiteralInteger;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class LiteralIntegerCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public LiteralIntegerCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLiteralInteger());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		LiteralInteger newElement = UMLFactory.eINSTANCE.createLiteralInteger();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_LiteralInteger_2096(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(LiteralInteger newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.LiteralInteger;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class LiteralIntegerCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public LiteralIntegerCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLiteralInteger());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		LiteralInteger newElement = UMLFactory.eINSTANCE.createLiteralInteger();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_LiteralInteger_2096(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(LiteralInteger newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralNullCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralNullCreateCommand.java
index 64fba2c18bf..a96c156c8ee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralNullCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralNullCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.LiteralNull;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class LiteralNullCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public LiteralNullCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLiteralNull());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		LiteralNull newElement = UMLFactory.eINSTANCE.createLiteralNull();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_LiteralNull_2097(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(LiteralNull newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.LiteralNull;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class LiteralNullCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public LiteralNullCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLiteralNull());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		LiteralNull newElement = UMLFactory.eINSTANCE.createLiteralNull();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_LiteralNull_2097(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(LiteralNull newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralStringCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralStringCreateCommand.java
index 0d19088b9b6..7e8ecb16307 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralStringCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralStringCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.LiteralString;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class LiteralStringCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public LiteralStringCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLiteralString());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		LiteralString newElement = UMLFactory.eINSTANCE.createLiteralString();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_LiteralString_2098(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(LiteralString newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.LiteralString;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class LiteralStringCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public LiteralStringCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLiteralString());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		LiteralString newElement = UMLFactory.eINSTANCE.createLiteralString();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_LiteralString_2098(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(LiteralString newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralUnlimitedNaturalCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralUnlimitedNaturalCreateCommand.java
index c22db99403d..5df9680550d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralUnlimitedNaturalCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/LiteralUnlimitedNaturalCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.LiteralUnlimitedNatural;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class LiteralUnlimitedNaturalCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public LiteralUnlimitedNaturalCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLiteralUnlimitedNatural());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		LiteralUnlimitedNatural newElement = UMLFactory.eINSTANCE.createLiteralUnlimitedNatural();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_LiteralUnlimitedNatural_2099(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(LiteralUnlimitedNatural newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.LiteralUnlimitedNatural;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class LiteralUnlimitedNaturalCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public LiteralUnlimitedNaturalCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getLiteralUnlimitedNatural());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		LiteralUnlimitedNatural newElement = UMLFactory.eINSTANCE.createLiteralUnlimitedNatural();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_LiteralUnlimitedNatural_2099(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(LiteralUnlimitedNatural newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ManifestationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ManifestationCreateCommand.java
index 1d978654496..b3528d9f144 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ManifestationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ManifestationCreateCommand.java
@@ -1,162 +1,165 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Manifestation;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-
-/**
- * @generated
- */
-public class ManifestationCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	protected final EObject source;
-	/**
-	 * @generated
-	 */
-	protected final EObject target;
-	/**
-	 * @generated
-	 */
-	protected Package container;
-
-	/**
-	 * @generated
-	 */
-	public ManifestationCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
-		super(request.getLabel(), null, request);
-		this.source = source;
-		this.target = target;
-		container = deduceContainer(source, target);
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (source == null && target == null) {
-			return false;
-		}
-		if (source != null && false == source instanceof NamedElement) {
-			return false;
-		}
-		if (target != null && false == target instanceof NamedElement) {
-			return false;
-		}
-		if (getSource() == null) {
-			return true; // link creation is in progress; source is not defined yet
-		}
-		// target may be null here but it's possible to check constraint
-		if (getContainer() == null) {
-			return false;
-		}
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateManifestation_4012(getContainer(), getSource(), getTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
-		}
-		Manifestation newElement = UMLFactory.eINSTANCE.createManifestation();
-		getContainer().getPackagedElements()
-				.add(newElement);
-		newElement.getClients()
-				.add(getSource());
-		newElement.getSuppliers()
-				.add(getTarget());
-		ElementInitializers.getInstance().init_Manifestation_4012(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Manifestation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());
-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setElementToEdit(EObject element) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getSource() {
-		return (NamedElement) source;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getTarget() {
-		return (NamedElement) target;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Package getContainer() {
-		return container;
-	}
-
-	/**
-	 * Default approach is to traverse ancestors of the source to find instance of container.
-	 * Modify with appropriate logic.
-	 * @generated
-	 */
-	protected Package deduceContainer(EObject source, EObject target) {
-		// Find container element for the new link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				return (Package) element;
-			}
-		}
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Manifestation;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+

+/**

+ * @generated

+ */

+public class ManifestationCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	protected final EObject source;

+

+	/**

+	 * @generated

+	 */

+	protected final EObject target;

+

+	/**

+	 * @generated

+	 */

+	protected Package container;

+

+	/**

+	 * @generated

+	 */

+	public ManifestationCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

+		super(request.getLabel(), null, request);

+		this.source = source;

+		this.target = target;

+		container = deduceContainer(source, target);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(source == null && target == null) {

+			return false;

+		}

+		if(source != null && false == source instanceof NamedElement) {

+			return false;

+		}

+		if(target != null && false == target instanceof NamedElement) {

+			return false;

+		}

+		if(getSource() == null) {

+			return true; // link creation is in progress; source is not defined yet

+		}

+		// target may be null here but it's possible to check constraint

+		if(getContainer() == null) {

+			return false;

+		}

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateManifestation_4012(getContainer(), getSource(), getTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

+		}

+

+		Manifestation newElement = UMLFactory.eINSTANCE.createManifestation();

+		getContainer().getPackagedElements().add(newElement);

+		newElement.getClients().add(getSource());

+		newElement.getSuppliers().add(getTarget());

+		ElementInitializers.getInstance().init_Manifestation_4012(newElement);

+		doConfigure(newElement, monitor, info);

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Manifestation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

+		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setElementToEdit(EObject element) {

+		throw new UnsupportedOperationException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getSource() {

+		return (NamedElement)source;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getTarget() {

+		return (NamedElement)target;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Package getContainer() {

+		return container;

+	}

+

+	/**

+	 * Default approach is to traverse ancestors of the source to find instance of container.

+	 * Modify with appropriate logic.

+	 * 

+	 * @generated

+	 */

+	protected Package deduceContainer(EObject source, EObject target) {

+		// Find container element for the new link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				return (Package)element;

+			}

+		}

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ManifestationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ManifestationReorientCommand.java
index aa331c621f6..be0089d933b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ManifestationReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ManifestationReorientCommand.java
@@ -1,183 +1,176 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.uml2.uml.Manifestation;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-
-/**
- * @generated
- */
-public class ManifestationReorientCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private final int reorientDirection;
-	/**
-	 * @generated
-	 */
-	private final EObject oldEnd;
-	/**
-	 * @generated
-	 */
-	private final EObject newEnd;
-
-	/**
-	 * @generated
-	 */
-	public ManifestationReorientCommand(ReorientRelationshipRequest request) {
-		super(request.getLabel(), request.getRelationship(), request);
-		reorientDirection = request.getDirection();
-		oldEnd = request.getOldRelationshipEnd();
-		newEnd = request.getNewRelationshipEnd();
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (false == getElementToEdit() instanceof Manifestation) {
-			return false;
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return canReorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return canReorientTarget();
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientSource() {
-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
-			return false;
-		}
-		if (getLink().getSuppliers()
-				.size() != 1) {
-			return false;
-		}
-		NamedElement target = (NamedElement) getLink().getSuppliers()
-				.get(0);
-		if (!(getLink().eContainer() instanceof Package)) {
-			return false;
-		}
-		Package container = (Package) getLink().eContainer();
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistManifestation_4012(container, getLink(), getNewSource(), target);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientTarget() {
-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
-			return false;
-		}
-		if (getLink().getClients()
-				.size() != 1) {
-			return false;
-		}
-		NamedElement source = (NamedElement) getLink().getClients()
-				.get(0);
-		if (!(getLink().eContainer() instanceof Package)) {
-			return false;
-		}
-		Package container = (Package) getLink().eContainer();
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistManifestation_4012(container, getLink(), source, getNewTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(
-			IProgressMonitor monitor, IAdaptable info)
-			throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return reorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return reorientTarget();
-		}
-		throw new IllegalStateException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientSource() throws ExecutionException {
-		getLink().getClients()
-				.remove(getOldSource());
-		getLink().getClients()
-				.add(getNewSource());
-		return CommandResult.newOKCommandResult(getLink());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientTarget() throws ExecutionException {
-		getLink().getSuppliers()
-				.remove(getOldTarget());
-		getLink().getSuppliers()
-				.add(getNewTarget());
-		return CommandResult.newOKCommandResult(getLink());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Manifestation getLink() {
-		return (Manifestation) getElementToEdit();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getOldSource() {
-		return (NamedElement) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getNewSource() {
-		return (NamedElement) newEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getOldTarget() {
-		return (NamedElement) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getNewTarget() {
-		return (NamedElement) newEnd;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.uml2.uml.Manifestation;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Package;

+

+/**

+ * @generated

+ */

+public class ManifestationReorientCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private final int reorientDirection;

+

+	/**

+	 * @generated

+	 */

+	private final EObject oldEnd;

+

+	/**

+	 * @generated

+	 */

+	private final EObject newEnd;

+

+	/**

+	 * @generated

+	 */

+	public ManifestationReorientCommand(ReorientRelationshipRequest request) {

+		super(request.getLabel(), request.getRelationship(), request);

+		reorientDirection = request.getDirection();

+		oldEnd = request.getOldRelationshipEnd();

+		newEnd = request.getNewRelationshipEnd();

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(false == getElementToEdit() instanceof Manifestation) {

+			return false;

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return canReorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return canReorientTarget();

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientSource() {

+		if(!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

+			return false;

+		}

+		if(getLink().getSuppliers().size() != 1) {

+			return false;

+		}

+		NamedElement target = (NamedElement)getLink().getSuppliers().get(0);

+		if(!(getLink().eContainer() instanceof Package)) {

+			return false;

+		}

+		Package container = (Package)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistManifestation_4012(container, getLink(), getNewSource(), target);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientTarget() {

+		if(!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

+			return false;

+		}

+		if(getLink().getClients().size() != 1) {

+			return false;

+		}

+		NamedElement source = (NamedElement)getLink().getClients().get(0);

+		if(!(getLink().eContainer() instanceof Package)) {

+			return false;

+		}

+		Package container = (Package)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistManifestation_4012(container, getLink(), source, getNewTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return reorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return reorientTarget();

+		}

+		throw new IllegalStateException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientSource() throws ExecutionException {

+		getLink().getClients().remove(getOldSource());

+		getLink().getClients().add(getNewSource());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientTarget() throws ExecutionException {

+		getLink().getSuppliers().remove(getOldTarget());

+		getLink().getSuppliers().add(getNewTarget());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Manifestation getLink() {

+		return (Manifestation)getElementToEdit();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getOldSource() {

+		return (NamedElement)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getNewSource() {

+		return (NamedElement)newEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getOldTarget() {

+		return (NamedElement)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getNewTarget() {

+		return (NamedElement)newEnd;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/NodeCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/NodeCompositeCreateCommand.java
index 10990ba1e73..a69a3d3119e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/NodeCompositeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/NodeCompositeCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Node;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class NodeCompositeCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public NodeCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getNode());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Node newElement = UMLFactory.eINSTANCE.createNode();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Node_2072(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Node newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Node;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class NodeCompositeCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public NodeCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getNode());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Node newElement = UMLFactory.eINSTANCE.createNode();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Node_2072(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Node newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/NodeCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/NodeCompositeCreateCommandCN.java
index c705928fdee..e76a82721ea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/NodeCompositeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/NodeCompositeCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Node;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class NodeCompositeCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public NodeCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getNode());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Node newElement = UMLFactory.eINSTANCE.createNode();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Class qualifiedTarget = (Class) target;
-				qualifiedTarget.getNestedClassifiers()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Node_3084(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Node newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.Node;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class NodeCompositeCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public NodeCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getNode());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Node newElement = UMLFactory.eINSTANCE.createNode();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Class qualifiedTarget = (Class)target;

+				qualifiedTarget.getNestedClassifiers().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Node_3084(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Node newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueBehaviorCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueBehaviorCompositeCreateCommand.java
index d6c6dcac6ce..6122132fbe8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueBehaviorCompositeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueBehaviorCompositeCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.OpaqueBehavior;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class OpaqueBehaviorCompositeCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public OpaqueBehaviorCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getOpaqueBehavior());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		OpaqueBehavior newElement = UMLFactory.eINSTANCE.createOpaqueBehavior();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_OpaqueBehavior_2065(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(OpaqueBehavior newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.OpaqueBehavior;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class OpaqueBehaviorCompositeCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public OpaqueBehaviorCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getOpaqueBehavior());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		OpaqueBehavior newElement = UMLFactory.eINSTANCE.createOpaqueBehavior();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_OpaqueBehavior_2065(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(OpaqueBehavior newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueBehaviorCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueBehaviorCompositeCreateCommandCN.java
index 9ccb48e10f6..fbd88a9fcde 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueBehaviorCompositeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueBehaviorCompositeCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.OpaqueBehavior;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class OpaqueBehaviorCompositeCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public OpaqueBehaviorCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getOpaqueBehavior());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		OpaqueBehavior newElement = UMLFactory.eINSTANCE.createOpaqueBehavior();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Class qualifiedTarget = (Class) target;
-				qualifiedTarget.getNestedClassifiers()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_OpaqueBehavior_3077(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(OpaqueBehavior newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.OpaqueBehavior;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class OpaqueBehaviorCompositeCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public OpaqueBehaviorCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getOpaqueBehavior());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		OpaqueBehavior newElement = UMLFactory.eINSTANCE.createOpaqueBehavior();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Class qualifiedTarget = (Class)target;

+				qualifiedTarget.getNestedClassifiers().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_OpaqueBehavior_3077(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(OpaqueBehavior newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueExpressionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueExpressionCreateCommand.java
index 07ba6055a6d..71a200e2e17 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueExpressionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OpaqueExpressionCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.OpaqueExpression;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class OpaqueExpressionCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public OpaqueExpressionCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getOpaqueExpression());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		OpaqueExpression newElement = UMLFactory.eINSTANCE.createOpaqueExpression();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_OpaqueExpression_2101(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(OpaqueExpression newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.OpaqueExpression;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class OpaqueExpressionCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public OpaqueExpressionCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getOpaqueExpression());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		OpaqueExpression newElement = UMLFactory.eINSTANCE.createOpaqueExpression();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_OpaqueExpression_2101(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(OpaqueExpression newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OperationCreateCommandCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OperationCreateCommandCLN.java
index 18c5c29a46a..71773a886f6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OperationCreateCommandCLN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/OperationCreateCommandCLN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Operation;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class OperationCreateCommandCLN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public OperationCreateCommandCLN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getOperation());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Operation newElement = UMLFactory.eINSTANCE.createOperation();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Class qualifiedTarget = (Class) target;
-				qualifiedTarget.getOwnedOperations()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Operation_3102(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Operation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.Operation;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class OperationCreateCommandCLN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public OperationCreateCommandCLN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getOperation());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Operation newElement = UMLFactory.eINSTANCE.createOperation();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Class qualifiedTarget = (Class)target;

+				qualifiedTarget.getOwnedOperations().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Operation_3102(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Operation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ParameterCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ParameterCreateCommand.java
index eebe3330a00..336a1834f93 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ParameterCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ParameterCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Behavior;
-import org.eclipse.uml2.uml.Parameter;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class ParameterCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public ParameterCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getParameter());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Parameter newElement = UMLFactory.eINSTANCE.createParameter();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Behavior qualifiedTarget = (Behavior) target;
-				qualifiedTarget.getOwnedParameters()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Parameter_3088(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Parameter newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Behavior;

+import org.eclipse.uml2.uml.Parameter;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class ParameterCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public ParameterCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getParameter());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Parameter newElement = UMLFactory.eINSTANCE.createParameter();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Behavior qualifiedTarget = (Behavior)target;

+				qualifiedTarget.getOwnedParameters().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Parameter_3088(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Parameter newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PortCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PortCreateCommand.java
index aa8b36ecb31..3c757766183 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PortCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PortCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.StructuredClassifier;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class PortCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public PortCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getPort());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Port newElement = UMLFactory.eINSTANCE.createPort();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				StructuredClassifier qualifiedTarget = (StructuredClassifier) target;
-				qualifiedTarget.getOwnedAttributes()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Port_3069(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Port newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Port;

+import org.eclipse.uml2.uml.StructuredClassifier;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class PortCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public PortCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getPort());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Port newElement = UMLFactory.eINSTANCE.createPort();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				StructuredClassifier qualifiedTarget = (StructuredClassifier)target;

+				qualifiedTarget.getOwnedAttributes().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Port_3069(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Port newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PrimitiveTypeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PrimitiveTypeCreateCommand.java
index fe1aa316cca..e7dad7f2da4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PrimitiveTypeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PrimitiveTypeCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.PrimitiveType;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class PrimitiveTypeCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public PrimitiveTypeCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getPrimitiveType());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		PrimitiveType newElement = UMLFactory.eINSTANCE.createPrimitiveType();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_PrimitiveType_2066(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(PrimitiveType newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.PrimitiveType;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class PrimitiveTypeCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public PrimitiveTypeCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getPrimitiveType());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		PrimitiveType newElement = UMLFactory.eINSTANCE.createPrimitiveType();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_PrimitiveType_2066(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(PrimitiveType newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PrimitiveTypeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PrimitiveTypeCreateCommandCN.java
index f777f4bfddd..c88a916198e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PrimitiveTypeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PrimitiveTypeCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.PrimitiveType;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class PrimitiveTypeCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public PrimitiveTypeCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getPrimitiveType());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		PrimitiveType newElement = UMLFactory.eINSTANCE.createPrimitiveType();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Class qualifiedTarget = (Class) target;
-				qualifiedTarget.getNestedClassifiers()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_PrimitiveType_3078(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(PrimitiveType newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.PrimitiveType;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class PrimitiveTypeCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public PrimitiveTypeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getPrimitiveType());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		PrimitiveType newElement = UMLFactory.eINSTANCE.createPrimitiveType();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Class qualifiedTarget = (Class)target;

+				qualifiedTarget.getNestedClassifiers().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_PrimitiveType_3078(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(PrimitiveType newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PropertyCreateCommandCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PropertyCreateCommandCLN.java
index c7143191a69..f3ba3b84f69 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PropertyCreateCommandCLN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PropertyCreateCommandCLN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.StructuredClassifier;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class PropertyCreateCommandCLN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public PropertyCreateCommandCLN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getProperty());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Property newElement = UMLFactory.eINSTANCE.createProperty();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				StructuredClassifier qualifiedTarget = (StructuredClassifier) target;
-				qualifiedTarget.getOwnedAttributes()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Property_3101(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Property newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Property;

+import org.eclipse.uml2.uml.StructuredClassifier;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class PropertyCreateCommandCLN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public PropertyCreateCommandCLN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getProperty());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Property newElement = UMLFactory.eINSTANCE.createProperty();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				StructuredClassifier qualifiedTarget = (StructuredClassifier)target;

+				qualifiedTarget.getOwnedAttributes().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Property_3101(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Property newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PropertyPartCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PropertyPartCreateCommandCN.java
index a9893f4e09a..bb142587fa7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PropertyPartCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/PropertyPartCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.StructuredClassifier;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class PropertyPartCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public PropertyPartCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getProperty());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Property newElement = UMLFactory.eINSTANCE.createProperty();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				StructuredClassifier qualifiedTarget = (StructuredClassifier) target;
-				qualifiedTarget.getOwnedAttributes()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Property_3070(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Property newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Property;

+import org.eclipse.uml2.uml.StructuredClassifier;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class PropertyPartCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public PropertyPartCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getProperty());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Property newElement = UMLFactory.eINSTANCE.createProperty();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				StructuredClassifier qualifiedTarget = (StructuredClassifier)target;

+				qualifiedTarget.getOwnedAttributes().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Property_3070(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Property newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ProtocolStateMachineCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ProtocolStateMachineCompositeCreateCommand.java
index cb7cd0504b8..751cf91b632 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ProtocolStateMachineCompositeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ProtocolStateMachineCompositeCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.ProtocolStateMachine;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class ProtocolStateMachineCompositeCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public ProtocolStateMachineCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getProtocolStateMachine());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		ProtocolStateMachine newElement = UMLFactory.eINSTANCE.createProtocolStateMachine();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_ProtocolStateMachine_2062(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(ProtocolStateMachine newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.ProtocolStateMachine;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class ProtocolStateMachineCompositeCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public ProtocolStateMachineCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getProtocolStateMachine());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		ProtocolStateMachine newElement = UMLFactory.eINSTANCE.createProtocolStateMachine();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_ProtocolStateMachine_2062(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(ProtocolStateMachine newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ProtocolStateMachineCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ProtocolStateMachineCompositeCreateCommandCN.java
index a2a997adcff..b351f2fa25a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ProtocolStateMachineCompositeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/ProtocolStateMachineCompositeCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.ProtocolStateMachine;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class ProtocolStateMachineCompositeCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public ProtocolStateMachineCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getProtocolStateMachine());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		ProtocolStateMachine newElement = UMLFactory.eINSTANCE.createProtocolStateMachine();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Class qualifiedTarget = (Class) target;
-				qualifiedTarget.getNestedClassifiers()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_ProtocolStateMachine_3074(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(ProtocolStateMachine newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.ProtocolStateMachine;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class ProtocolStateMachineCompositeCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public ProtocolStateMachineCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getProtocolStateMachine());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		ProtocolStateMachine newElement = UMLFactory.eINSTANCE.createProtocolStateMachine();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Class qualifiedTarget = (Class)target;

+				qualifiedTarget.getNestedClassifiers().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_ProtocolStateMachine_3074(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(ProtocolStateMachine newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RealizationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RealizationCreateCommand.java
index f55d9127885..795052818ae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RealizationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RealizationCreateCommand.java
@@ -1,162 +1,165 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Realization;
-import org.eclipse.uml2.uml.UMLFactory;
-
-/**
- * @generated
- */
-public class RealizationCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	protected final EObject source;
-	/**
-	 * @generated
-	 */
-	protected final EObject target;
-	/**
-	 * @generated
-	 */
-	protected Package container;
-
-	/**
-	 * @generated
-	 */
-	public RealizationCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
-		super(request.getLabel(), null, request);
-		this.source = source;
-		this.target = target;
-		container = deduceContainer(source, target);
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (source == null && target == null) {
-			return false;
-		}
-		if (source != null && false == source instanceof NamedElement) {
-			return false;
-		}
-		if (target != null && false == target instanceof NamedElement) {
-			return false;
-		}
-		if (getSource() == null) {
-			return true; // link creation is in progress; source is not defined yet
-		}
-		// target may be null here but it's possible to check constraint
-		if (getContainer() == null) {
-			return false;
-		}
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateRealization_4006(getContainer(), getSource(), getTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
-		}
-		Realization newElement = UMLFactory.eINSTANCE.createRealization();
-		getContainer().getPackagedElements()
-				.add(newElement);
-		newElement.getClients()
-				.add(getSource());
-		newElement.getSuppliers()
-				.add(getTarget());
-		ElementInitializers.getInstance().init_Realization_4006(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Realization newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());
-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setElementToEdit(EObject element) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getSource() {
-		return (NamedElement) source;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getTarget() {
-		return (NamedElement) target;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Package getContainer() {
-		return container;
-	}
-
-	/**
-	 * Default approach is to traverse ancestors of the source to find instance of container.
-	 * Modify with appropriate logic.
-	 * @generated
-	 */
-	protected Package deduceContainer(EObject source, EObject target) {
-		// Find container element for the new link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				return (Package) element;
-			}
-		}
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.Realization;

+import org.eclipse.uml2.uml.UMLFactory;

+

+/**

+ * @generated

+ */

+public class RealizationCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	protected final EObject source;

+

+	/**

+	 * @generated

+	 */

+	protected final EObject target;

+

+	/**

+	 * @generated

+	 */

+	protected Package container;

+

+	/**

+	 * @generated

+	 */

+	public RealizationCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

+		super(request.getLabel(), null, request);

+		this.source = source;

+		this.target = target;

+		container = deduceContainer(source, target);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(source == null && target == null) {

+			return false;

+		}

+		if(source != null && false == source instanceof NamedElement) {

+			return false;

+		}

+		if(target != null && false == target instanceof NamedElement) {

+			return false;

+		}

+		if(getSource() == null) {

+			return true; // link creation is in progress; source is not defined yet

+		}

+		// target may be null here but it's possible to check constraint

+		if(getContainer() == null) {

+			return false;

+		}

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateRealization_4006(getContainer(), getSource(), getTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

+		}

+

+		Realization newElement = UMLFactory.eINSTANCE.createRealization();

+		getContainer().getPackagedElements().add(newElement);

+		newElement.getClients().add(getSource());

+		newElement.getSuppliers().add(getTarget());

+		ElementInitializers.getInstance().init_Realization_4006(newElement);

+		doConfigure(newElement, monitor, info);

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Realization newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

+		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setElementToEdit(EObject element) {

+		throw new UnsupportedOperationException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getSource() {

+		return (NamedElement)source;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getTarget() {

+		return (NamedElement)target;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Package getContainer() {

+		return container;

+	}

+

+	/**

+	 * Default approach is to traverse ancestors of the source to find instance of container.

+	 * Modify with appropriate logic.

+	 * 

+	 * @generated

+	 */

+	protected Package deduceContainer(EObject source, EObject target) {

+		// Find container element for the new link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				return (Package)element;

+			}

+		}

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RealizationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RealizationReorientCommand.java
index 1e3f9e24b22..9be627bdc9d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RealizationReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RealizationReorientCommand.java
@@ -1,183 +1,176 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Realization;
-
-/**
- * @generated
- */
-public class RealizationReorientCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private final int reorientDirection;
-	/**
-	 * @generated
-	 */
-	private final EObject oldEnd;
-	/**
-	 * @generated
-	 */
-	private final EObject newEnd;
-
-	/**
-	 * @generated
-	 */
-	public RealizationReorientCommand(ReorientRelationshipRequest request) {
-		super(request.getLabel(), request.getRelationship(), request);
-		reorientDirection = request.getDirection();
-		oldEnd = request.getOldRelationshipEnd();
-		newEnd = request.getNewRelationshipEnd();
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (false == getElementToEdit() instanceof Realization) {
-			return false;
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return canReorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return canReorientTarget();
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientSource() {
-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
-			return false;
-		}
-		if (getLink().getSuppliers()
-				.size() != 1) {
-			return false;
-		}
-		NamedElement target = (NamedElement) getLink().getSuppliers()
-				.get(0);
-		if (!(getLink().eContainer() instanceof Package)) {
-			return false;
-		}
-		Package container = (Package) getLink().eContainer();
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistRealization_4006(container, getLink(), getNewSource(), target);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientTarget() {
-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
-			return false;
-		}
-		if (getLink().getClients()
-				.size() != 1) {
-			return false;
-		}
-		NamedElement source = (NamedElement) getLink().getClients()
-				.get(0);
-		if (!(getLink().eContainer() instanceof Package)) {
-			return false;
-		}
-		Package container = (Package) getLink().eContainer();
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistRealization_4006(container, getLink(), source, getNewTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(
-			IProgressMonitor monitor, IAdaptable info)
-			throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return reorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return reorientTarget();
-		}
-		throw new IllegalStateException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientSource() throws ExecutionException {
-		getLink().getClients()
-				.remove(getOldSource());
-		getLink().getClients()
-				.add(getNewSource());
-		return CommandResult.newOKCommandResult(getLink());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientTarget() throws ExecutionException {
-		getLink().getSuppliers()
-				.remove(getOldTarget());
-		getLink().getSuppliers()
-				.add(getNewTarget());
-		return CommandResult.newOKCommandResult(getLink());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Realization getLink() {
-		return (Realization) getElementToEdit();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getOldSource() {
-		return (NamedElement) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getNewSource() {
-		return (NamedElement) newEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getOldTarget() {
-		return (NamedElement) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getNewTarget() {
-		return (NamedElement) newEnd;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.Realization;

+

+/**

+ * @generated

+ */

+public class RealizationReorientCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private final int reorientDirection;

+

+	/**

+	 * @generated

+	 */

+	private final EObject oldEnd;

+

+	/**

+	 * @generated

+	 */

+	private final EObject newEnd;

+

+	/**

+	 * @generated

+	 */

+	public RealizationReorientCommand(ReorientRelationshipRequest request) {

+		super(request.getLabel(), request.getRelationship(), request);

+		reorientDirection = request.getDirection();

+		oldEnd = request.getOldRelationshipEnd();

+		newEnd = request.getNewRelationshipEnd();

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(false == getElementToEdit() instanceof Realization) {

+			return false;

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return canReorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return canReorientTarget();

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientSource() {

+		if(!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

+			return false;

+		}

+		if(getLink().getSuppliers().size() != 1) {

+			return false;

+		}

+		NamedElement target = (NamedElement)getLink().getSuppliers().get(0);

+		if(!(getLink().eContainer() instanceof Package)) {

+			return false;

+		}

+		Package container = (Package)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistRealization_4006(container, getLink(), getNewSource(), target);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientTarget() {

+		if(!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

+			return false;

+		}

+		if(getLink().getClients().size() != 1) {

+			return false;

+		}

+		NamedElement source = (NamedElement)getLink().getClients().get(0);

+		if(!(getLink().eContainer() instanceof Package)) {

+			return false;

+		}

+		Package container = (Package)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistRealization_4006(container, getLink(), source, getNewTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return reorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return reorientTarget();

+		}

+		throw new IllegalStateException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientSource() throws ExecutionException {

+		getLink().getClients().remove(getOldSource());

+		getLink().getClients().add(getNewSource());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientTarget() throws ExecutionException {

+		getLink().getSuppliers().remove(getOldTarget());

+		getLink().getSuppliers().add(getNewTarget());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Realization getLink() {

+		return (Realization)getElementToEdit();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getOldSource() {

+		return (NamedElement)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getNewSource() {

+		return (NamedElement)newEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getOldTarget() {

+		return (NamedElement)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getNewTarget() {

+		return (NamedElement)newEnd;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RepresentationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RepresentationCreateCommand.java
index f66fdc0cfa7..eac58c4fff7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RepresentationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RepresentationCreateCommand.java
@@ -1,101 +1,104 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.uml2.uml.Classifier;
-import org.eclipse.uml2.uml.InformationItem;
-
-/**
- * @generated
- */
-public class RepresentationCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	protected final EObject source;
-	/**
-	 * @generated
-	 */
-	protected final EObject target;
-
-	/**
-	 * @generated
-	 */
-	public RepresentationCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
-		super(request.getLabel(), null, request);
-		this.source = source;
-		this.target = target;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (source == null && target == null) {
-			return false;
-		}
-		if (source != null && false == source instanceof InformationItem) {
-			return false;
-		}
-		if (target != null && false == target instanceof Classifier) {
-			return false;
-		}
-		if (getSource() == null) {
-			return true; // link creation is in progress; source is not defined yet
-		}
-		// target may be null here but it's possible to check constraint
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateInformationItemRepresented_4020(getSource(), getTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
-		}
-		if (getSource() != null && getTarget() != null) {
-			getSource().getRepresenteds()
-					.add(getTarget());
-		}
-		return CommandResult.newOKCommandResult();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setElementToEdit(EObject element) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected InformationItem getSource() {
-		return (InformationItem) source;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Classifier getTarget() {
-		return (Classifier) target;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.uml2.uml.Classifier;

+import org.eclipse.uml2.uml.InformationItem;

+

+/**

+ * @generated

+ */

+public class RepresentationCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	protected final EObject source;

+

+	/**

+	 * @generated

+	 */

+	protected final EObject target;

+

+	/**

+	 * @generated

+	 */

+	public RepresentationCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

+		super(request.getLabel(), null, request);

+		this.source = source;

+		this.target = target;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(source == null && target == null) {

+			return false;

+		}

+		if(source != null && false == source instanceof InformationItem) {

+			return false;

+		}

+		if(target != null && false == target instanceof Classifier) {

+			return false;

+		}

+		if(getSource() == null) {

+			return true; // link creation is in progress; source is not defined yet

+		}

+		// target may be null here but it's possible to check constraint

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateInformationItemRepresented_4020(getSource(), getTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

+		}

+

+		if(getSource() != null && getTarget() != null) {

+			getSource().getRepresenteds().add(getTarget());

+		}

+		return CommandResult.newOKCommandResult();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setElementToEdit(EObject element) {

+		throw new UnsupportedOperationException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected InformationItem getSource() {

+		return (InformationItem)source;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Classifier getTarget() {

+		return (Classifier)target;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RepresentationReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RepresentationReorientCommand.java
index f9b63eb069d..c859c1cbcf9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RepresentationReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RepresentationReorientCommand.java
@@ -1,161 +1,159 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.uml2.uml.Classifier;
-import org.eclipse.uml2.uml.InformationItem;
-
-/**
- * @generated
- */
-public class RepresentationReorientCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private final int reorientDirection;
-	/**
-	 * @generated
-	 */
-	private final EObject referenceOwner;
-	/**
-	 * @generated
-	 */
-	private final EObject oldEnd;
-	/**
-	 * @generated
-	 */
-	private final EObject newEnd;
-
-	/**
-	 * @generated
-	 */
-	public RepresentationReorientCommand(ReorientReferenceRelationshipRequest request) {
-		super(request.getLabel(), null, request);
-		reorientDirection = request.getDirection();
-		referenceOwner = request.getReferenceOwner();
-		oldEnd = request.getOldRelationshipEnd();
-		newEnd = request.getNewRelationshipEnd();
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (false == referenceOwner instanceof InformationItem) {
-			return false;
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return canReorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return canReorientTarget();
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientSource() {
-		if (!(oldEnd instanceof Classifier && newEnd instanceof InformationItem)) {
-			return false;
-		}
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistInformationItemRepresented_4020(getNewSource(), getOldTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientTarget() {
-		if (!(oldEnd instanceof Classifier && newEnd instanceof Classifier)) {
-			return false;
-		}
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistInformationItemRepresented_4020(getOldSource(), getNewTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(
-			IProgressMonitor monitor, IAdaptable info)
-			throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return reorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return reorientTarget();
-		}
-		throw new IllegalStateException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientSource() throws ExecutionException {
-		getOldSource().getRepresenteds()
-				.remove(getOldTarget());
-		getNewSource().getRepresenteds()
-				.add(getOldTarget());
-		return CommandResult.newOKCommandResult(referenceOwner);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientTarget() throws ExecutionException {
-		getOldSource().getRepresenteds()
-				.remove(getOldTarget());
-		getOldSource().getRepresenteds()
-				.add(getNewTarget());
-		return CommandResult.newOKCommandResult(referenceOwner);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected InformationItem getOldSource() {
-		return (InformationItem) referenceOwner;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected InformationItem getNewSource() {
-		return (InformationItem) newEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Classifier getOldTarget() {
-		return (Classifier) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Classifier getNewTarget() {
-		return (Classifier) newEnd;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.uml2.uml.Classifier;

+import org.eclipse.uml2.uml.InformationItem;

+

+/**

+ * @generated

+ */

+public class RepresentationReorientCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private final int reorientDirection;

+

+	/**

+	 * @generated

+	 */

+	private final EObject referenceOwner;

+

+	/**

+	 * @generated

+	 */

+	private final EObject oldEnd;

+

+	/**

+	 * @generated

+	 */

+	private final EObject newEnd;

+

+	/**

+	 * @generated

+	 */

+	public RepresentationReorientCommand(ReorientReferenceRelationshipRequest request) {

+		super(request.getLabel(), null, request);

+		reorientDirection = request.getDirection();

+		referenceOwner = request.getReferenceOwner();

+		oldEnd = request.getOldRelationshipEnd();

+		newEnd = request.getNewRelationshipEnd();

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(false == referenceOwner instanceof InformationItem) {

+			return false;

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return canReorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return canReorientTarget();

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientSource() {

+		if(!(oldEnd instanceof Classifier && newEnd instanceof InformationItem)) {

+			return false;

+		}

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistInformationItemRepresented_4020(getNewSource(), getOldTarget());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientTarget() {

+		if(!(oldEnd instanceof Classifier && newEnd instanceof Classifier)) {

+			return false;

+		}

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistInformationItemRepresented_4020(getOldSource(), getNewTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return reorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return reorientTarget();

+		}

+		throw new IllegalStateException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientSource() throws ExecutionException {

+		getOldSource().getRepresenteds().remove(getOldTarget());

+		getNewSource().getRepresenteds().add(getOldTarget());

+		return CommandResult.newOKCommandResult(referenceOwner);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientTarget() throws ExecutionException {

+		getOldSource().getRepresenteds().remove(getOldTarget());

+		getOldSource().getRepresenteds().add(getNewTarget());

+		return CommandResult.newOKCommandResult(referenceOwner);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected InformationItem getOldSource() {

+		return (InformationItem)referenceOwner;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected InformationItem getNewSource() {

+		return (InformationItem)newEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Classifier getOldTarget() {

+		return (Classifier)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Classifier getNewTarget() {

+		return (Classifier)newEnd;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RoleBindingCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RoleBindingCreateCommand.java
index 3052e1af5a3..0e41fea863f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RoleBindingCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RoleBindingCreateCommand.java
@@ -1,160 +1,163 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.uml2.uml.Dependency;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-
-/**
- * @generated
- */
-public class RoleBindingCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	protected final EObject source;
-	/**
-	 * @generated
-	 */
-	protected final EObject target;
-	/**
-	 * @generated
-	 */
-	protected Package container;
-
-	/**
-	 * @generated
-	 */
-	public RoleBindingCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
-		super(request.getLabel(), null, request);
-		this.source = source;
-		this.target = target;
-		container = deduceContainer(source, target);
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (source == null && target == null) {
-			return false;
-		}
-		if (source != null && false == source instanceof NamedElement) {
-			return false;
-		}
-		if (target != null && false == target instanceof NamedElement) {
-			return false;
-		}
-		if (getSource() == null) {
-			return true; // link creation is in progress; source is not defined yet
-		}
-		// target may be null here but it's possible to check constraint
-		if (getContainer() == null) {
-			return false;
-		}
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateDependency_4017(getContainer(), getSource(), getTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
-		}
-		Dependency newElement = UMLFactory.eINSTANCE.createDependency();
-		getContainer().getPackagedElements()
-				.add(newElement);
-		newElement.getClients()
-				.add(getSource());
-		newElement.getSuppliers()
-				.add(getTarget());
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Dependency newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());
-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setElementToEdit(EObject element) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getSource() {
-		return (NamedElement) source;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getTarget() {
-		return (NamedElement) target;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Package getContainer() {
-		return container;
-	}
-
-	/**
-	 * Default approach is to traverse ancestors of the source to find instance of container.
-	 * Modify with appropriate logic.
-	 * @generated
-	 */
-	protected Package deduceContainer(EObject source, EObject target) {
-		// Find container element for the new link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				return (Package) element;
-			}
-		}
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.uml2.uml.Dependency;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+

+/**

+ * @generated

+ */

+public class RoleBindingCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	protected final EObject source;

+

+	/**

+	 * @generated

+	 */

+	protected final EObject target;

+

+	/**

+	 * @generated

+	 */

+	protected Package container;

+

+	/**

+	 * @generated

+	 */

+	public RoleBindingCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

+		super(request.getLabel(), null, request);

+		this.source = source;

+		this.target = target;

+		container = deduceContainer(source, target);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(source == null && target == null) {

+			return false;

+		}

+		if(source != null && false == source instanceof NamedElement) {

+			return false;

+		}

+		if(target != null && false == target instanceof NamedElement) {

+			return false;

+		}

+		if(getSource() == null) {

+			return true; // link creation is in progress; source is not defined yet

+		}

+		// target may be null here but it's possible to check constraint

+		if(getContainer() == null) {

+			return false;

+		}

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateDependency_4017(getContainer(), getSource(), getTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

+		}

+

+		Dependency newElement = UMLFactory.eINSTANCE.createDependency();

+		getContainer().getPackagedElements().add(newElement);

+		newElement.getClients().add(getSource());

+		newElement.getSuppliers().add(getTarget());

+		doConfigure(newElement, monitor, info);

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Dependency newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

+		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setElementToEdit(EObject element) {

+		throw new UnsupportedOperationException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getSource() {

+		return (NamedElement)source;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getTarget() {

+		return (NamedElement)target;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Package getContainer() {

+		return container;

+	}

+

+	/**

+	 * Default approach is to traverse ancestors of the source to find instance of container.

+	 * Modify with appropriate logic.

+	 * 

+	 * @generated

+	 */

+	protected Package deduceContainer(EObject source, EObject target) {

+		// Find container element for the new link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				return (Package)element;

+			}

+		}

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RoleBindingReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RoleBindingReorientCommand.java
index 2eb185a114f..81272f14f1d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RoleBindingReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/RoleBindingReorientCommand.java
@@ -1,183 +1,176 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.uml2.uml.Dependency;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-
-/**
- * @generated
- */
-public class RoleBindingReorientCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private final int reorientDirection;
-	/**
-	 * @generated
-	 */
-	private final EObject oldEnd;
-	/**
-	 * @generated
-	 */
-	private final EObject newEnd;
-
-	/**
-	 * @generated
-	 */
-	public RoleBindingReorientCommand(ReorientRelationshipRequest request) {
-		super(request.getLabel(), request.getRelationship(), request);
-		reorientDirection = request.getDirection();
-		oldEnd = request.getOldRelationshipEnd();
-		newEnd = request.getNewRelationshipEnd();
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (false == getElementToEdit() instanceof Dependency) {
-			return false;
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return canReorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return canReorientTarget();
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientSource() {
-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
-			return false;
-		}
-		if (getLink().getSuppliers()
-				.size() != 1) {
-			return false;
-		}
-		NamedElement target = (NamedElement) getLink().getSuppliers()
-				.get(0);
-		if (!(getLink().eContainer() instanceof Package)) {
-			return false;
-		}
-		Package container = (Package) getLink().eContainer();
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDependency_4017(container, getLink(), getNewSource(), target);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientTarget() {
-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
-			return false;
-		}
-		if (getLink().getClients()
-				.size() != 1) {
-			return false;
-		}
-		NamedElement source = (NamedElement) getLink().getClients()
-				.get(0);
-		if (!(getLink().eContainer() instanceof Package)) {
-			return false;
-		}
-		Package container = (Package) getLink().eContainer();
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDependency_4017(container, getLink(), source, getNewTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(
-			IProgressMonitor monitor, IAdaptable info)
-			throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return reorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return reorientTarget();
-		}
-		throw new IllegalStateException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientSource() throws ExecutionException {
-		getLink().getClients()
-				.remove(getOldSource());
-		getLink().getClients()
-				.add(getNewSource());
-		return CommandResult.newOKCommandResult(getLink());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientTarget() throws ExecutionException {
-		getLink().getSuppliers()
-				.remove(getOldTarget());
-		getLink().getSuppliers()
-				.add(getNewTarget());
-		return CommandResult.newOKCommandResult(getLink());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Dependency getLink() {
-		return (Dependency) getElementToEdit();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getOldSource() {
-		return (NamedElement) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getNewSource() {
-		return (NamedElement) newEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getOldTarget() {
-		return (NamedElement) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getNewTarget() {
-		return (NamedElement) newEnd;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.uml2.uml.Dependency;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Package;

+

+/**

+ * @generated

+ */

+public class RoleBindingReorientCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private final int reorientDirection;

+

+	/**

+	 * @generated

+	 */

+	private final EObject oldEnd;

+

+	/**

+	 * @generated

+	 */

+	private final EObject newEnd;

+

+	/**

+	 * @generated

+	 */

+	public RoleBindingReorientCommand(ReorientRelationshipRequest request) {

+		super(request.getLabel(), request.getRelationship(), request);

+		reorientDirection = request.getDirection();

+		oldEnd = request.getOldRelationshipEnd();

+		newEnd = request.getNewRelationshipEnd();

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(false == getElementToEdit() instanceof Dependency) {

+			return false;

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return canReorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return canReorientTarget();

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientSource() {

+		if(!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

+			return false;

+		}

+		if(getLink().getSuppliers().size() != 1) {

+			return false;

+		}

+		NamedElement target = (NamedElement)getLink().getSuppliers().get(0);

+		if(!(getLink().eContainer() instanceof Package)) {

+			return false;

+		}

+		Package container = (Package)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDependency_4017(container, getLink(), getNewSource(), target);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientTarget() {

+		if(!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

+			return false;

+		}

+		if(getLink().getClients().size() != 1) {

+			return false;

+		}

+		NamedElement source = (NamedElement)getLink().getClients().get(0);

+		if(!(getLink().eContainer() instanceof Package)) {

+			return false;

+		}

+		Package container = (Package)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistDependency_4017(container, getLink(), source, getNewTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return reorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return reorientTarget();

+		}

+		throw new IllegalStateException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientSource() throws ExecutionException {

+		getLink().getClients().remove(getOldSource());

+		getLink().getClients().add(getNewSource());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientTarget() throws ExecutionException {

+		getLink().getSuppliers().remove(getOldTarget());

+		getLink().getSuppliers().add(getNewTarget());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Dependency getLink() {

+		return (Dependency)getElementToEdit();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getOldSource() {

+		return (NamedElement)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getNewSource() {

+		return (NamedElement)newEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getOldTarget() {

+		return (NamedElement)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getNewTarget() {

+		return (NamedElement)newEnd;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalCreateCommand.java
index 4c51c5c216c..5f031e807d4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Signal;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class SignalCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public SignalCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getSignal());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Signal newElement = UMLFactory.eINSTANCE.createSignal();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Signal_2081(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Signal newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.Signal;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class SignalCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public SignalCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getSignal());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Signal newElement = UMLFactory.eINSTANCE.createSignal();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Signal_2081(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Signal newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalCreateCommandCN.java
index aadb8595a1b..da3eea2b05d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Signal;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class SignalCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public SignalCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getSignal());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		Signal newElement = UMLFactory.eINSTANCE.createSignal();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Class qualifiedTarget = (Class) target;
-				qualifiedTarget.getNestedClassifiers()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_Signal_3095(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Signal newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.Signal;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class SignalCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public SignalCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getSignal());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		Signal newElement = UMLFactory.eINSTANCE.createSignal();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Class qualifiedTarget = (Class)target;

+				qualifiedTarget.getNestedClassifiers().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_Signal_3095(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Signal newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalEventCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalEventCreateCommand.java
index c6d4e0ecaff..8d172181d1f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalEventCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SignalEventCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.SignalEvent;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class SignalEventCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public SignalEventCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getSignalEvent());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		SignalEvent newElement = UMLFactory.eINSTANCE.createSignalEvent();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_SignalEvent_2083(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(SignalEvent newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.SignalEvent;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class SignalEventCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public SignalEventCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getSignalEvent());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		SignalEvent newElement = UMLFactory.eINSTANCE.createSignalEvent();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_SignalEvent_2083(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(SignalEvent newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StateMachineCompositeCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StateMachineCompositeCreateCommand.java
index 2572bbd3f59..b24558d754a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StateMachineCompositeCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StateMachineCompositeCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.StateMachine;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class StateMachineCompositeCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public StateMachineCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getStateMachine());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		StateMachine newElement = UMLFactory.eINSTANCE.createStateMachine();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_StateMachine_2063(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(StateMachine newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.StateMachine;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class StateMachineCompositeCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public StateMachineCompositeCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getStateMachine());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		StateMachine newElement = UMLFactory.eINSTANCE.createStateMachine();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_StateMachine_2063(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(StateMachine newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StateMachineCompositeCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StateMachineCompositeCreateCommandCN.java
index 35d37313703..4861d167c71 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StateMachineCompositeCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StateMachineCompositeCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.StateMachine;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class StateMachineCompositeCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public StateMachineCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getStateMachine());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		StateMachine newElement = UMLFactory.eINSTANCE.createStateMachine();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Class qualifiedTarget = (Class) target;
-				qualifiedTarget.getNestedClassifiers()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_StateMachine_3075(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(StateMachine newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.StateMachine;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class StateMachineCompositeCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public StateMachineCompositeCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getStateMachine());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		StateMachine newElement = UMLFactory.eINSTANCE.createStateMachine();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Class qualifiedTarget = (Class)target;

+				qualifiedTarget.getNestedClassifiers().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_StateMachine_3075(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(StateMachine newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StringExpressionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StringExpressionCreateCommand.java
index 9cf3c22133e..eabd0304179 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StringExpressionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/StringExpressionCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.StringExpression;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class StringExpressionCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public StringExpressionCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getStringExpression());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		StringExpression newElement = UMLFactory.eINSTANCE.createStringExpression();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_StringExpression_2100(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(StringExpression newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.StringExpression;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class StringExpressionCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public StringExpressionCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getStringExpression());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		StringExpression newElement = UMLFactory.eINSTANCE.createStringExpression();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_StringExpression_2100(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(StringExpression newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SubstitutionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SubstitutionCreateCommand.java
index ee1cf233d20..e20a913a324 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SubstitutionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SubstitutionCreateCommand.java
@@ -1,162 +1,165 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Substitution;
-import org.eclipse.uml2.uml.UMLFactory;
-
-/**
- * @generated
- */
-public class SubstitutionCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	protected final EObject source;
-	/**
-	 * @generated
-	 */
-	protected final EObject target;
-	/**
-	 * @generated
-	 */
-	protected Package container;
-
-	/**
-	 * @generated
-	 */
-	public SubstitutionCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
-		super(request.getLabel(), null, request);
-		this.source = source;
-		this.target = target;
-		container = deduceContainer(source, target);
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (source == null && target == null) {
-			return false;
-		}
-		if (source != null && false == source instanceof NamedElement) {
-			return false;
-		}
-		if (target != null && false == target instanceof NamedElement) {
-			return false;
-		}
-		if (getSource() == null) {
-			return true; // link creation is in progress; source is not defined yet
-		}
-		// target may be null here but it's possible to check constraint
-		if (getContainer() == null) {
-			return false;
-		}
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateSubstitution_4011(getContainer(), getSource(), getTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
-		}
-		Substitution newElement = UMLFactory.eINSTANCE.createSubstitution();
-		getContainer().getPackagedElements()
-				.add(newElement);
-		newElement.getClients()
-				.add(getSource());
-		newElement.getSuppliers()
-				.add(getTarget());
-		ElementInitializers.getInstance().init_Substitution_4011(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Substitution newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());
-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setElementToEdit(EObject element) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getSource() {
-		return (NamedElement) source;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getTarget() {
-		return (NamedElement) target;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Package getContainer() {
-		return container;
-	}
-
-	/**
-	 * Default approach is to traverse ancestors of the source to find instance of container.
-	 * Modify with appropriate logic.
-	 * @generated
-	 */
-	protected Package deduceContainer(EObject source, EObject target) {
-		// Find container element for the new link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				return (Package) element;
-			}
-		}
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.Substitution;

+import org.eclipse.uml2.uml.UMLFactory;

+

+/**

+ * @generated

+ */

+public class SubstitutionCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	protected final EObject source;

+

+	/**

+	 * @generated

+	 */

+	protected final EObject target;

+

+	/**

+	 * @generated

+	 */

+	protected Package container;

+

+	/**

+	 * @generated

+	 */

+	public SubstitutionCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

+		super(request.getLabel(), null, request);

+		this.source = source;

+		this.target = target;

+		container = deduceContainer(source, target);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(source == null && target == null) {

+			return false;

+		}

+		if(source != null && false == source instanceof NamedElement) {

+			return false;

+		}

+		if(target != null && false == target instanceof NamedElement) {

+			return false;

+		}

+		if(getSource() == null) {

+			return true; // link creation is in progress; source is not defined yet

+		}

+		// target may be null here but it's possible to check constraint

+		if(getContainer() == null) {

+			return false;

+		}

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateSubstitution_4011(getContainer(), getSource(), getTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

+		}

+

+		Substitution newElement = UMLFactory.eINSTANCE.createSubstitution();

+		getContainer().getPackagedElements().add(newElement);

+		newElement.getClients().add(getSource());

+		newElement.getSuppliers().add(getTarget());

+		ElementInitializers.getInstance().init_Substitution_4011(newElement);

+		doConfigure(newElement, monitor, info);

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Substitution newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

+		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setElementToEdit(EObject element) {

+		throw new UnsupportedOperationException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getSource() {

+		return (NamedElement)source;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getTarget() {

+		return (NamedElement)target;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Package getContainer() {

+		return container;

+	}

+

+	/**

+	 * Default approach is to traverse ancestors of the source to find instance of container.

+	 * Modify with appropriate logic.

+	 * 

+	 * @generated

+	 */

+	protected Package deduceContainer(EObject source, EObject target) {

+		// Find container element for the new link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				return (Package)element;

+			}

+		}

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SubstitutionReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SubstitutionReorientCommand.java
index c0b403fe80d..2ee5108b2f8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SubstitutionReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/SubstitutionReorientCommand.java
@@ -1,183 +1,176 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Substitution;
-
-/**
- * @generated
- */
-public class SubstitutionReorientCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private final int reorientDirection;
-	/**
-	 * @generated
-	 */
-	private final EObject oldEnd;
-	/**
-	 * @generated
-	 */
-	private final EObject newEnd;
-
-	/**
-	 * @generated
-	 */
-	public SubstitutionReorientCommand(ReorientRelationshipRequest request) {
-		super(request.getLabel(), request.getRelationship(), request);
-		reorientDirection = request.getDirection();
-		oldEnd = request.getOldRelationshipEnd();
-		newEnd = request.getNewRelationshipEnd();
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (false == getElementToEdit() instanceof Substitution) {
-			return false;
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return canReorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return canReorientTarget();
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientSource() {
-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
-			return false;
-		}
-		if (getLink().getSuppliers()
-				.size() != 1) {
-			return false;
-		}
-		NamedElement target = (NamedElement) getLink().getSuppliers()
-				.get(0);
-		if (!(getLink().eContainer() instanceof Package)) {
-			return false;
-		}
-		Package container = (Package) getLink().eContainer();
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistSubstitution_4011(container, getLink(), getNewSource(), target);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientTarget() {
-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
-			return false;
-		}
-		if (getLink().getClients()
-				.size() != 1) {
-			return false;
-		}
-		NamedElement source = (NamedElement) getLink().getClients()
-				.get(0);
-		if (!(getLink().eContainer() instanceof Package)) {
-			return false;
-		}
-		Package container = (Package) getLink().eContainer();
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistSubstitution_4011(container, getLink(), source, getNewTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(
-			IProgressMonitor monitor, IAdaptable info)
-			throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return reorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return reorientTarget();
-		}
-		throw new IllegalStateException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientSource() throws ExecutionException {
-		getLink().getClients()
-				.remove(getOldSource());
-		getLink().getClients()
-				.add(getNewSource());
-		return CommandResult.newOKCommandResult(getLink());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientTarget() throws ExecutionException {
-		getLink().getSuppliers()
-				.remove(getOldTarget());
-		getLink().getSuppliers()
-				.add(getNewTarget());
-		return CommandResult.newOKCommandResult(getLink());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Substitution getLink() {
-		return (Substitution) getElementToEdit();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getOldSource() {
-		return (NamedElement) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getNewSource() {
-		return (NamedElement) newEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getOldTarget() {
-		return (NamedElement) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getNewTarget() {
-		return (NamedElement) newEnd;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.Substitution;

+

+/**

+ * @generated

+ */

+public class SubstitutionReorientCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private final int reorientDirection;

+

+	/**

+	 * @generated

+	 */

+	private final EObject oldEnd;

+

+	/**

+	 * @generated

+	 */

+	private final EObject newEnd;

+

+	/**

+	 * @generated

+	 */

+	public SubstitutionReorientCommand(ReorientRelationshipRequest request) {

+		super(request.getLabel(), request.getRelationship(), request);

+		reorientDirection = request.getDirection();

+		oldEnd = request.getOldRelationshipEnd();

+		newEnd = request.getNewRelationshipEnd();

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(false == getElementToEdit() instanceof Substitution) {

+			return false;

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return canReorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return canReorientTarget();

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientSource() {

+		if(!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

+			return false;

+		}

+		if(getLink().getSuppliers().size() != 1) {

+			return false;

+		}

+		NamedElement target = (NamedElement)getLink().getSuppliers().get(0);

+		if(!(getLink().eContainer() instanceof Package)) {

+			return false;

+		}

+		Package container = (Package)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistSubstitution_4011(container, getLink(), getNewSource(), target);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientTarget() {

+		if(!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

+			return false;

+		}

+		if(getLink().getClients().size() != 1) {

+			return false;

+		}

+		NamedElement source = (NamedElement)getLink().getClients().get(0);

+		if(!(getLink().eContainer() instanceof Package)) {

+			return false;

+		}

+		Package container = (Package)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistSubstitution_4011(container, getLink(), source, getNewTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return reorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return reorientTarget();

+		}

+		throw new IllegalStateException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientSource() throws ExecutionException {

+		getLink().getClients().remove(getOldSource());

+		getLink().getClients().add(getNewSource());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientTarget() throws ExecutionException {

+		getLink().getSuppliers().remove(getOldTarget());

+		getLink().getSuppliers().add(getNewTarget());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Substitution getLink() {

+		return (Substitution)getElementToEdit();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getOldSource() {

+		return (NamedElement)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getNewSource() {

+		return (NamedElement)newEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getOldTarget() {

+		return (NamedElement)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getNewTarget() {

+		return (NamedElement)newEnd;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeConstraintCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeConstraintCreateCommand.java
index 12894ad66c8..24e230f4483 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeConstraintCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeConstraintCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Namespace;
-import org.eclipse.uml2.uml.TimeConstraint;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class TimeConstraintCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public TimeConstraintCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeConstraint());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		TimeConstraint newElement = UMLFactory.eINSTANCE.createTimeConstraint();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Namespace qualifiedTarget = (Namespace) target;
-				qualifiedTarget.getOwnedRules()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_TimeConstraint_2111(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(TimeConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Namespace;

+import org.eclipse.uml2.uml.TimeConstraint;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class TimeConstraintCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public TimeConstraintCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeConstraint());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		TimeConstraint newElement = UMLFactory.eINSTANCE.createTimeConstraint();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Namespace qualifiedTarget = (Namespace)target;

+				qualifiedTarget.getOwnedRules().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_TimeConstraint_2111(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(TimeConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeConstraintCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeConstraintCreateCommandCN.java
index 47c68929d69..70598351e02 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeConstraintCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeConstraintCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Namespace;
-import org.eclipse.uml2.uml.TimeConstraint;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class TimeConstraintCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public TimeConstraintCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeConstraint());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		TimeConstraint newElement = UMLFactory.eINSTANCE.createTimeConstraint();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Namespace qualifiedTarget = (Namespace) target;
-				qualifiedTarget.getOwnedRules()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_TimeConstraint_3117(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(TimeConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Namespace;

+import org.eclipse.uml2.uml.TimeConstraint;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class TimeConstraintCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public TimeConstraintCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeConstraint());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		TimeConstraint newElement = UMLFactory.eINSTANCE.createTimeConstraint();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Namespace qualifiedTarget = (Namespace)target;

+				qualifiedTarget.getOwnedRules().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_TimeConstraint_3117(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(TimeConstraint newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeEventCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeEventCreateCommand.java
index 563910e5b1c..ab6e813086d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeEventCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeEventCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.TimeEvent;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class TimeEventCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public TimeEventCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeEvent());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		TimeEvent newElement = UMLFactory.eINSTANCE.createTimeEvent();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_TimeEvent_2089(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(TimeEvent newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.TimeEvent;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class TimeEventCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public TimeEventCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeEvent());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		TimeEvent newElement = UMLFactory.eINSTANCE.createTimeEvent();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_TimeEvent_2089(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(TimeEvent newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeExpressionCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeExpressionCreateCommand.java
index e6ee609501c..4bd608e6283 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeExpressionCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeExpressionCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.TimeExpression;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class TimeExpressionCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public TimeExpressionCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeExpression());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		TimeExpression newElement = UMLFactory.eINSTANCE.createTimeExpression();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_TimeExpression_2102(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(TimeExpression newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.TimeExpression;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class TimeExpressionCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public TimeExpressionCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeExpression());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		TimeExpression newElement = UMLFactory.eINSTANCE.createTimeExpression();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_TimeExpression_2102(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(TimeExpression newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeIntervalCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeIntervalCreateCommand.java
index 0e4b97be6fb..57a3ebfbdfc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeIntervalCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeIntervalCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.TimeInterval;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class TimeIntervalCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public TimeIntervalCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeInterval());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		TimeInterval newElement = UMLFactory.eINSTANCE.createTimeInterval();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_TimeInterval_2105(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(TimeInterval newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.TimeInterval;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class TimeIntervalCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public TimeIntervalCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeInterval());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		TimeInterval newElement = UMLFactory.eINSTANCE.createTimeInterval();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_TimeInterval_2105(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(TimeInterval newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationCreateCommand.java
index 109f5c4fb0b..77d402ae2eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.TimeObservation;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class TimeObservationCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public TimeObservationCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeObservation());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		TimeObservation newElement = UMLFactory.eINSTANCE.createTimeObservation();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_TimeObservation_2094(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(TimeObservation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.TimeObservation;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class TimeObservationCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public TimeObservationCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getTimeObservation());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		TimeObservation newElement = UMLFactory.eINSTANCE.createTimeObservation();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_TimeObservation_2094(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(TimeObservation newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationEventCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationEventCreateCommand.java
index 0a9bd2236d4..5677622dbf7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationEventCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationEventCreateCommand.java
@@ -1,102 +1,104 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.TimeObservation;
-
-/**
- * @generated
- */
-public class TimeObservationEventCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	protected final EObject source;
-	/**
-	 * @generated
-	 */
-	protected final EObject target;
-
-	/**
-	 * @generated
-	 */
-	public TimeObservationEventCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
-		super(request.getLabel(), null, request);
-		this.source = source;
-		this.target = target;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (source == null && target == null) {
-			return false;
-		}
-		if (source != null && false == source instanceof TimeObservation) {
-			return false;
-		}
-		if (target != null && false == target instanceof NamedElement) {
-			return false;
-		}
-		if (getSource() == null) {
-			return true; // link creation is in progress; source is not defined yet
-		}
-		// target may be null here but it's possible to check constraint
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateTimeObservationEvent_4018(getSource(), getTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
-		}
-		if (getSource() != null && getTarget() != null) {
-			getSource().setEvent(
-					getTarget()
-					);
-		}
-		return CommandResult.newOKCommandResult();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setElementToEdit(EObject element) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected TimeObservation getSource() {
-		return (TimeObservation) source;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getTarget() {
-		return (NamedElement) target;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.TimeObservation;

+

+/**

+ * @generated

+ */

+public class TimeObservationEventCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	protected final EObject source;

+

+	/**

+	 * @generated

+	 */

+	protected final EObject target;

+

+	/**

+	 * @generated

+	 */

+	public TimeObservationEventCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

+		super(request.getLabel(), null, request);

+		this.source = source;

+		this.target = target;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(source == null && target == null) {

+			return false;

+		}

+		if(source != null && false == source instanceof TimeObservation) {

+			return false;

+		}

+		if(target != null && false == target instanceof NamedElement) {

+			return false;

+		}

+		if(getSource() == null) {

+			return true; // link creation is in progress; source is not defined yet

+		}

+		// target may be null here but it's possible to check constraint

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateTimeObservationEvent_4018(getSource(), getTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

+		}

+

+		if(getSource() != null && getTarget() != null) {

+			getSource().setEvent(getTarget());

+		}

+		return CommandResult.newOKCommandResult();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setElementToEdit(EObject element) {

+		throw new UnsupportedOperationException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected TimeObservation getSource() {

+		return (TimeObservation)source;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getTarget() {

+		return (NamedElement)target;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationEventReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationEventReorientCommand.java
index 479c1472628..ca6d837a551 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationEventReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/TimeObservationEventReorientCommand.java
@@ -1,162 +1,158 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.TimeObservation;
-
-/**
- * @generated
- */
-public class TimeObservationEventReorientCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private final int reorientDirection;
-	/**
-	 * @generated
-	 */
-	private final EObject referenceOwner;
-	/**
-	 * @generated
-	 */
-	private final EObject oldEnd;
-	/**
-	 * @generated
-	 */
-	private final EObject newEnd;
-
-	/**
-	 * @generated
-	 */
-	public TimeObservationEventReorientCommand(ReorientReferenceRelationshipRequest request) {
-		super(request.getLabel(), null, request);
-		reorientDirection = request.getDirection();
-		referenceOwner = request.getReferenceOwner();
-		oldEnd = request.getOldRelationshipEnd();
-		newEnd = request.getNewRelationshipEnd();
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (false == referenceOwner instanceof TimeObservation) {
-			return false;
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return canReorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return canReorientTarget();
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientSource() {
-		if (!(oldEnd instanceof NamedElement && newEnd instanceof TimeObservation)) {
-			return false;
-		}
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistTimeObservationEvent_4018(getNewSource(), getOldTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientTarget() {
-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
-			return false;
-		}
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistTimeObservationEvent_4018(getOldSource(), getNewTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(
-			IProgressMonitor monitor, IAdaptable info)
-			throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return reorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return reorientTarget();
-		}
-		throw new IllegalStateException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientSource() throws ExecutionException {
-		getOldSource().setEvent(
-				null
-				);
-		getNewSource().setEvent(
-				getOldTarget()
-				);
-		return CommandResult.newOKCommandResult(referenceOwner);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientTarget() throws ExecutionException {
-		getOldSource().setEvent(
-				getNewTarget()
-				);
-		return CommandResult.newOKCommandResult(referenceOwner);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected TimeObservation getOldSource() {
-		return (TimeObservation) referenceOwner;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected TimeObservation getNewSource() {
-		return (TimeObservation) newEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getOldTarget() {
-		return (NamedElement) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getNewTarget() {
-		return (NamedElement) newEnd;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.TimeObservation;

+

+/**

+ * @generated

+ */

+public class TimeObservationEventReorientCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private final int reorientDirection;

+

+	/**

+	 * @generated

+	 */

+	private final EObject referenceOwner;

+

+	/**

+	 * @generated

+	 */

+	private final EObject oldEnd;

+

+	/**

+	 * @generated

+	 */

+	private final EObject newEnd;

+

+	/**

+	 * @generated

+	 */

+	public TimeObservationEventReorientCommand(ReorientReferenceRelationshipRequest request) {

+		super(request.getLabel(), null, request);

+		reorientDirection = request.getDirection();

+		referenceOwner = request.getReferenceOwner();

+		oldEnd = request.getOldRelationshipEnd();

+		newEnd = request.getNewRelationshipEnd();

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(false == referenceOwner instanceof TimeObservation) {

+			return false;

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return canReorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return canReorientTarget();

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientSource() {

+		if(!(oldEnd instanceof NamedElement && newEnd instanceof TimeObservation)) {

+			return false;

+		}

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistTimeObservationEvent_4018(getNewSource(), getOldTarget());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientTarget() {

+		if(!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

+			return false;

+		}

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistTimeObservationEvent_4018(getOldSource(), getNewTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return reorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return reorientTarget();

+		}

+		throw new IllegalStateException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientSource() throws ExecutionException {

+		getOldSource().setEvent(null);

+		getNewSource().setEvent(getOldTarget());

+		return CommandResult.newOKCommandResult(referenceOwner);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientTarget() throws ExecutionException {

+		getOldSource().setEvent(getNewTarget());

+		return CommandResult.newOKCommandResult(referenceOwner);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected TimeObservation getOldSource() {

+		return (TimeObservation)referenceOwner;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected TimeObservation getNewSource() {

+		return (TimeObservation)newEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getOldTarget() {

+		return (NamedElement)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getNewTarget() {

+		return (NamedElement)newEnd;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UsageCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UsageCreateCommand.java
index 33bb86daabe..021c8bde36b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UsageCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UsageCreateCommand.java
@@ -1,162 +1,165 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.Usage;
-
-/**
- * @generated
- */
-public class UsageCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	protected final EObject source;
-	/**
-	 * @generated
-	 */
-	protected final EObject target;
-	/**
-	 * @generated
-	 */
-	protected Package container;
-
-	/**
-	 * @generated
-	 */
-	public UsageCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {
-		super(request.getLabel(), null, request);
-		this.source = source;
-		this.target = target;
-		container = deduceContainer(source, target);
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (source == null && target == null) {
-			return false;
-		}
-		if (source != null && false == source instanceof NamedElement) {
-			return false;
-		}
-		if (target != null && false == target instanceof NamedElement) {
-			return false;
-		}
-		if (getSource() == null) {
-			return true; // link creation is in progress; source is not defined yet
-		}
-		// target may be null here but it's possible to check constraint
-		if (getContainer() == null) {
-			return false;
-		}
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateUsage_4008(getContainer(), getSource(), getTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$
-		}
-		Usage newElement = UMLFactory.eINSTANCE.createUsage();
-		getContainer().getPackagedElements()
-				.add(newElement);
-		newElement.getClients()
-				.add(getSource());
-		newElement.getSuppliers()
-				.add(getTarget());
-		ElementInitializers.getInstance().init_Usage_4008(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(Usage newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());
-		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setElementToEdit(EObject element) {
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getSource() {
-		return (NamedElement) source;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getTarget() {
-		return (NamedElement) target;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Package getContainer() {
-		return container;
-	}
-
-	/**
-	 * Default approach is to traverse ancestors of the source to find instance of container.
-	 * Modify with appropriate logic.
-	 * @generated
-	 */
-	protected Package deduceContainer(EObject source, EObject target) {
-		// Find container element for the new link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				return (Package) element;
-			}
-		}
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.Usage;

+

+/**

+ * @generated

+ */

+public class UsageCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	protected final EObject source;

+

+	/**

+	 * @generated

+	 */

+	protected final EObject target;

+

+	/**

+	 * @generated

+	 */

+	protected Package container;

+

+	/**

+	 * @generated

+	 */

+	public UsageCreateCommand(CreateRelationshipRequest request, EObject source, EObject target) {

+		super(request.getLabel(), null, request);

+		this.source = source;

+		this.target = target;

+		container = deduceContainer(source, target);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(source == null && target == null) {

+			return false;

+		}

+		if(source != null && false == source instanceof NamedElement) {

+			return false;

+		}

+		if(target != null && false == target instanceof NamedElement) {

+			return false;

+		}

+		if(getSource() == null) {

+			return true; // link creation is in progress; source is not defined yet

+		}

+		// target may be null here but it's possible to check constraint

+		if(getContainer() == null) {

+			return false;

+		}

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canCreateUsage_4008(getContainer(), getSource(), getTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in create link command"); //$NON-NLS-1$

+		}

+

+		Usage newElement = UMLFactory.eINSTANCE.createUsage();

+		getContainer().getPackagedElements().add(newElement);

+		newElement.getClients().add(getSource());

+		newElement.getSuppliers().add(getTarget());

+		ElementInitializers.getInstance().init_Usage_4008(newElement);

+		doConfigure(newElement, monitor, info);

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(Usage newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		configureRequest.setParameter(CreateRelationshipRequest.SOURCE, getSource());

+		configureRequest.setParameter(CreateRelationshipRequest.TARGET, getTarget());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setElementToEdit(EObject element) {

+		throw new UnsupportedOperationException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getSource() {

+		return (NamedElement)source;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getTarget() {

+		return (NamedElement)target;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Package getContainer() {

+		return container;

+	}

+

+	/**

+	 * Default approach is to traverse ancestors of the source to find instance of container.

+	 * Modify with appropriate logic.

+	 * 

+	 * @generated

+	 */

+	protected Package deduceContainer(EObject source, EObject target) {

+		// Find container element for the new link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				return (Package)element;

+			}

+		}

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UsageReorientCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UsageReorientCommand.java
index 956a993eb56..b1a4541f90b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UsageReorientCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UsageReorientCommand.java
@@ -1,183 +1,176 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Usage;
-
-/**
- * @generated
- */
-public class UsageReorientCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private final int reorientDirection;
-	/**
-	 * @generated
-	 */
-	private final EObject oldEnd;
-	/**
-	 * @generated
-	 */
-	private final EObject newEnd;
-
-	/**
-	 * @generated
-	 */
-	public UsageReorientCommand(ReorientRelationshipRequest request) {
-		super(request.getLabel(), request.getRelationship(), request);
-		reorientDirection = request.getDirection();
-		oldEnd = request.getOldRelationshipEnd();
-		newEnd = request.getNewRelationshipEnd();
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		if (false == getElementToEdit() instanceof Usage) {
-			return false;
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return canReorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return canReorientTarget();
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientSource() {
-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
-			return false;
-		}
-		if (getLink().getSuppliers()
-				.size() != 1) {
-			return false;
-		}
-		NamedElement target = (NamedElement) getLink().getSuppliers()
-				.get(0);
-		if (!(getLink().eContainer() instanceof Package)) {
-			return false;
-		}
-		Package container = (Package) getLink().eContainer();
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistUsage_4008(container, getLink(), getNewSource(), target);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean canReorientTarget() {
-		if (!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {
-			return false;
-		}
-		if (getLink().getClients()
-				.size() != 1) {
-			return false;
-		}
-		NamedElement source = (NamedElement) getLink().getClients()
-				.get(0);
-		if (!(getLink().eContainer() instanceof Package)) {
-			return false;
-		}
-		Package container = (Package) getLink().eContainer();
-		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistUsage_4008(container, getLink(), source, getNewTarget());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(
-			IProgressMonitor monitor, IAdaptable info)
-			throws ExecutionException {
-		if (!canExecute()) {
-			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return reorientSource();
-		}
-		if (reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {
-			return reorientTarget();
-		}
-		throw new IllegalStateException();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientSource() throws ExecutionException {
-		getLink().getClients()
-				.remove(getOldSource());
-		getLink().getClients()
-				.add(getNewSource());
-		return CommandResult.newOKCommandResult(getLink());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult reorientTarget() throws ExecutionException {
-		getLink().getSuppliers()
-				.remove(getOldTarget());
-		getLink().getSuppliers()
-				.add(getNewTarget());
-		return CommandResult.newOKCommandResult(getLink());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Usage getLink() {
-		return (Usage) getElementToEdit();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getOldSource() {
-		return (NamedElement) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getNewSource() {
-		return (NamedElement) newEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getOldTarget() {
-		return (NamedElement) oldEnd;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NamedElement getNewTarget() {
-		return (NamedElement) newEnd;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.Usage;

+

+/**

+ * @generated

+ */

+public class UsageReorientCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private final int reorientDirection;

+

+	/**

+	 * @generated

+	 */

+	private final EObject oldEnd;

+

+	/**

+	 * @generated

+	 */

+	private final EObject newEnd;

+

+	/**

+	 * @generated

+	 */

+	public UsageReorientCommand(ReorientRelationshipRequest request) {

+		super(request.getLabel(), request.getRelationship(), request);

+		reorientDirection = request.getDirection();

+		oldEnd = request.getOldRelationshipEnd();

+		newEnd = request.getNewRelationshipEnd();

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+		if(false == getElementToEdit() instanceof Usage) {

+			return false;

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return canReorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return canReorientTarget();

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientSource() {

+		if(!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

+			return false;

+		}

+		if(getLink().getSuppliers().size() != 1) {

+			return false;

+		}

+		NamedElement target = (NamedElement)getLink().getSuppliers().get(0);

+		if(!(getLink().eContainer() instanceof Package)) {

+			return false;

+		}

+		Package container = (Package)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistUsage_4008(container, getLink(), getNewSource(), target);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean canReorientTarget() {

+		if(!(oldEnd instanceof NamedElement && newEnd instanceof NamedElement)) {

+			return false;

+		}

+		if(getLink().getClients().size() != 1) {

+			return false;

+		}

+		NamedElement source = (NamedElement)getLink().getClients().get(0);

+		if(!(getLink().eContainer() instanceof Package)) {

+			return false;

+		}

+		Package container = (Package)getLink().eContainer();

+		return UMLBaseItemSemanticEditPolicy.getLinkConstraints().canExistUsage_4008(container, getLink(), source, getNewTarget());

+	}

+

+	/**

+	 * @generated

+	 */

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

+		if(!canExecute()) {

+			throw new ExecutionException("Invalid arguments in reorient link command"); //$NON-NLS-1$

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_SOURCE) {

+			return reorientSource();

+		}

+		if(reorientDirection == ReorientRelationshipRequest.REORIENT_TARGET) {

+			return reorientTarget();

+		}

+		throw new IllegalStateException();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientSource() throws ExecutionException {

+		getLink().getClients().remove(getOldSource());

+		getLink().getClients().add(getNewSource());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected CommandResult reorientTarget() throws ExecutionException {

+		getLink().getSuppliers().remove(getOldTarget());

+		getLink().getSuppliers().add(getNewTarget());

+		return CommandResult.newOKCommandResult(getLink());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Usage getLink() {

+		return (Usage)getElementToEdit();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getOldSource() {

+		return (NamedElement)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getNewSource() {

+		return (NamedElement)newEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getOldTarget() {

+		return (NamedElement)oldEnd;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NamedElement getNewTarget() {

+		return (NamedElement)newEnd;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UseCaseCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UseCaseCreateCommand.java
index 1623208384b..b1cf5ef79fb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UseCaseCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UseCaseCreateCommand.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.UseCase;
-
-/**
- * @generated
- */
-public class UseCaseCreateCommand extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public UseCaseCreateCommand(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getUseCase());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		UseCase newElement = UMLFactory.eINSTANCE.createUseCase();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Package qualifiedTarget = (Package) target;
-				qualifiedTarget.getPackagedElements()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_UseCase_2082(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(UseCase newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+import org.eclipse.uml2.uml.UseCase;

+

+/**

+ * @generated

+ */

+public class UseCaseCreateCommand extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public UseCaseCreateCommand(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getUseCase());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		UseCase newElement = UMLFactory.eINSTANCE.createUseCase();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Package qualifiedTarget = (Package)target;

+				qualifiedTarget.getPackagedElements().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_UseCase_2082(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(UseCase newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UseCaseCreateCommandCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UseCaseCreateCommandCN.java
index c6da8bcd2c0..2f95f6d2058 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UseCaseCreateCommandCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/commands/UseCaseCreateCommandCN.java
@@ -1,110 +1,122 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.commands;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;
-import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.UseCase;
-
-/**
- * @generated
- */
-public class UseCaseCreateCommandCN extends EditElementCommand {
-	/**
-	 * @generated
-	 */
-	private Diagram diagram = null;
-
-	/**
-	 * @generated
-	 */
-	public UseCaseCreateCommandCN(CreateElementRequest req, Diagram diagram) {
-		super(req.getLabel(), null, req);
-		this.diagram = diagram;
-	}
-
-	/**
-	 * FIXME: replace with setElementToEdit()
-	 * @generated
-	 */
-	protected EObject getElementToEdit() {
-		EObject container = ((CreateElementRequest) getRequest()).getContainer();
-		if (container instanceof View) {
-			container = ((View) container).getElement();
-		}
-		return container;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean canExecute() {
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getUseCase());
-		return data.isPermitted();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		UseCase newElement = UMLFactory.eINSTANCE.createUseCase();
-		EObject target = getElementToEdit();
-		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);
-		if (data.isPermitted()) {
-			if (data.isPathDefined()) {
-				if (!data.execute(target, newElement))
-					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");
-			} else {
-				Class qualifiedTarget = (Class) target;
-				qualifiedTarget.getNestedClassifiers()
-						.add(newElement);
-			}
-		} else {
-			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");
-		}
-		ElementInitializers.getInstance().init_UseCase_3096(newElement);
-		doConfigure(newElement, monitor, info);
-		((CreateElementRequest) getRequest()).setNewElement(newElement);
-		return CommandResult.newOKCommandResult(newElement);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doConfigure(UseCase newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IElementType elementType = ((CreateElementRequest) getRequest()).getElementType();
-		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);
-		configureRequest.setClientContext(((CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.commands;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

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

+import org.eclipse.papyrus.infra.viewpoints.policy.ModelAddData;

+import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.UMLPackage;

+import org.eclipse.uml2.uml.UseCase;

+

+/**

+ * @generated

+ */

+public class UseCaseCreateCommandCN extends EditElementCommand {

+

+	/**

+	 * @generated

+	 */

+	private Diagram diagram = null;

+

+	/**

+	 * @generated

+	 */

+	public UseCaseCreateCommandCN(CreateElementRequest req, Diagram diagram) {

+		super(req.getLabel(), null, req);

+		this.diagram = diagram;

+	}

+

+	/**

+	 * FIXME: replace with setElementToEdit()

+	 * 

+	 * @generated

+	 */

+	protected EObject getElementToEdit() {

+		EObject container = ((CreateElementRequest)getRequest()).getContainer();

+		if(container instanceof View) {

+			container = ((View)container).getElement();

+		}

+		return container;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean canExecute() {

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target.eClass(), UMLPackage.eINSTANCE.getUseCase());

+		return data.isPermitted();

+

+

+	}

+

+	/**

+	 * @generated

+	 */

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

+

+		UseCase newElement = UMLFactory.eINSTANCE.createUseCase();

+

+		EObject target = getElementToEdit();

+		ModelAddData data = PolicyChecker.getCurrent().getChildAddData(diagram, target, newElement);

+		if(data.isPermitted()) {

+			if(data.isPathDefined()) {

+				if(!data.execute(target, newElement))

+					return CommandResult.newErrorCommandResult("Failed to follow the policy-specified for the insertion of the new element");

+			} else {

+

+				Class qualifiedTarget = (Class)target;

+				qualifiedTarget.getNestedClassifiers().add(newElement);

+

+			}

+		} else {

+			return CommandResult.newErrorCommandResult("The active policy restricts the addition of this element");

+		}

+

+

+		ElementInitializers.getInstance().init_UseCase_3096(newElement);

+

+		doConfigure(newElement, monitor, info);

+

+		((CreateElementRequest)getRequest()).setNewElement(newElement);

+		return CommandResult.newOKCommandResult(newElement);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doConfigure(UseCase newElement, IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+		IElementType elementType = ((CreateElementRequest)getRequest()).getElementType();

+		ConfigureRequest configureRequest = new ConfigureRequest(getEditingDomain(), newElement, elementType);

+		configureRequest.setClientContext(((CreateElementRequest)getRequest()).getClientContext());

+		configureRequest.addParameters(getRequest().getParameters());

+		ICommand configureCommand = elementType.getEditCommand(configureRequest);

+		if(configureCommand != null && configureCommand.canExecute()) {

+			configureCommand.execute(monitor, info);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/AbstractionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/AbstractionEditHelper.java
index 18e9fbbaed4..cbf5f5f8b41 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/AbstractionEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/AbstractionEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class AbstractionEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class AbstractionEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ActivityEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ActivityEditHelper.java
index 6ca22878159..954ebbe8e47 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ActivityEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ActivityEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class ActivityEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class ActivityEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ActorEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ActorEditHelper.java
index 33cb64ed212..be7f5610153 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ActorEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ActorEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class ActorEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class ActorEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/AnyReceiveEventEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/AnyReceiveEventEditHelper.java
index d310d19194d..436f6bcf7a0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/AnyReceiveEventEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/AnyReceiveEventEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class AnyReceiveEventEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class AnyReceiveEventEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ArtifactEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ArtifactEditHelper.java
index 5aa5d662577..52a2275083b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ArtifactEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ArtifactEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class ArtifactEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class ArtifactEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CallEventEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CallEventEditHelper.java
index 5dd68da690b..006335e6924 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CallEventEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CallEventEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class CallEventEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class CallEventEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ChangeEventEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ChangeEventEditHelper.java
index a6fcdcc2dbf..0a269a0fa88 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ChangeEventEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ChangeEventEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class ChangeEventEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class ChangeEventEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ClassEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ClassEditHelper.java
index e581a6c1a45..d8c0d50aa32 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ClassEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ClassEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class ClassEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class ClassEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CollaborationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CollaborationEditHelper.java
index ebc91eb2fd4..c86bbed639b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CollaborationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CollaborationEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class CollaborationEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class CollaborationEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CollaborationRoleEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CollaborationRoleEditHelper.java
index e2e6aa9bd57..72c529146e7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CollaborationRoleEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CollaborationRoleEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class CollaborationRoleEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class CollaborationRoleEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CollaborationUseEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CollaborationUseEditHelper.java
index 130f77b1428..ecf40f94a6a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CollaborationUseEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CollaborationUseEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class CollaborationUseEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class CollaborationUseEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CommentEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CommentEditHelper.java
index 85948fc1f7f..5c850699ca0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CommentEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/CommentEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class CommentEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class CommentEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ComponentEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ComponentEditHelper.java
index e0f9963a770..32b1c7b9d6f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ComponentEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ComponentEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class ComponentEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class ComponentEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ComponentRealizationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ComponentRealizationEditHelper.java
index dce1ed0b1a2..e71edef0a7f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ComponentRealizationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ComponentRealizationEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class ComponentRealizationEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class ComponentRealizationEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ConnectorEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ConnectorEditHelper.java
index 145b8f52e5c..c2626528ef8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ConnectorEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ConnectorEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class ConnectorEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class ConnectorEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ConstraintEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ConstraintEditHelper.java
index 359d2bc36a7..748b7184e83 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ConstraintEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ConstraintEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class ConstraintEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class ConstraintEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DataTypeEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DataTypeEditHelper.java
index 108e1e7f7b8..b77a1941b2a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DataTypeEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DataTypeEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class DataTypeEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class DataTypeEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DependencyEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DependencyEditHelper.java
index 66434b2c4f2..ca2ca36c3ca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DependencyEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DependencyEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class DependencyEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class DependencyEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DeploymentEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DeploymentEditHelper.java
index b2c28a8a608..0cfb46396a8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DeploymentEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DeploymentEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class DeploymentEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class DeploymentEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DeploymentSpecificationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DeploymentSpecificationEditHelper.java
index 2695bb6c666..3c192e31b93 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DeploymentSpecificationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DeploymentSpecificationEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class DeploymentSpecificationEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class DeploymentSpecificationEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DeviceEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DeviceEditHelper.java
index 69f2439dbf2..88b086efb70 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DeviceEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DeviceEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class DeviceEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class DeviceEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DurationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DurationEditHelper.java
index 945e89a5414..d37538eb490 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DurationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DurationEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class DurationEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class DurationEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DurationIntervalEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DurationIntervalEditHelper.java
index b360d840920..4bcee5ccd29 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DurationIntervalEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DurationIntervalEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class DurationIntervalEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class DurationIntervalEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DurationObservationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DurationObservationEditHelper.java
index 8d6a0c03399..0a0a76ea281 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DurationObservationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/DurationObservationEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class DurationObservationEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class DurationObservationEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/EnumerationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/EnumerationEditHelper.java
index d6745f5358d..6c6d0593f59 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/EnumerationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/EnumerationEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class EnumerationEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class EnumerationEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/EnumerationLiteralEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/EnumerationLiteralEditHelper.java
index 317e511e2e2..65e4daf9bf5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/EnumerationLiteralEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/EnumerationLiteralEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class EnumerationLiteralEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class EnumerationLiteralEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ExecutionEnvironmentEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ExecutionEnvironmentEditHelper.java
index 96b9d1f451f..9006474b526 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ExecutionEnvironmentEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ExecutionEnvironmentEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class ExecutionEnvironmentEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class ExecutionEnvironmentEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ExpressionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ExpressionEditHelper.java
index 51390fd696b..17f31aa1f65 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ExpressionEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ExpressionEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class ExpressionEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class ExpressionEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/FunctionBehaviorEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/FunctionBehaviorEditHelper.java
index b8f2fada024..73e7c9069bd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/FunctionBehaviorEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/FunctionBehaviorEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class FunctionBehaviorEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class FunctionBehaviorEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/GeneralizationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/GeneralizationEditHelper.java
index 24da9c0ac5e..c09604d85af 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/GeneralizationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/GeneralizationEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class GeneralizationEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class GeneralizationEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InformationFlowEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InformationFlowEditHelper.java
index f9f662e5eb2..9b776b3afd6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InformationFlowEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InformationFlowEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class InformationFlowEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class InformationFlowEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InformationItemEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InformationItemEditHelper.java
index c2403950d40..32899b45c1d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InformationItemEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InformationItemEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class InformationItemEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class InformationItemEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InstanceValueEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InstanceValueEditHelper.java
index 48d2507cab8..01b7795070b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InstanceValueEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InstanceValueEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class InstanceValueEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class InstanceValueEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InteractionConstraintEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InteractionConstraintEditHelper.java
index f2c1f78dd2e..f6e246c1d2a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InteractionConstraintEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InteractionConstraintEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class InteractionConstraintEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class InteractionConstraintEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InteractionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InteractionEditHelper.java
index b67bc0aa4e2..b29c85d1070 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InteractionEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InteractionEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class InteractionEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class InteractionEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InterfaceEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InterfaceEditHelper.java
index fdcc6c12869..91c6ce2cce7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InterfaceEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InterfaceEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class InterfaceEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class InterfaceEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InterfaceRealizationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InterfaceRealizationEditHelper.java
index 9df77c5afd7..569a554013f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InterfaceRealizationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/InterfaceRealizationEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class InterfaceRealizationEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class InterfaceRealizationEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/IntervalConstraintEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/IntervalConstraintEditHelper.java
index a393bfb8e85..b9c628249df 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/IntervalConstraintEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/IntervalConstraintEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class IntervalConstraintEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class IntervalConstraintEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/IntervalEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/IntervalEditHelper.java
index 306b6145f10..aa0321c2d3f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/IntervalEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/IntervalEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class IntervalEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class IntervalEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralBooleanEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralBooleanEditHelper.java
index 111336170de..a5df7bff32e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralBooleanEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralBooleanEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class LiteralBooleanEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class LiteralBooleanEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralIntegerEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralIntegerEditHelper.java
index 0e8f27e5eed..3bda281b37a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralIntegerEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralIntegerEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class LiteralIntegerEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class LiteralIntegerEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralNullEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralNullEditHelper.java
index d6cb7df0f40..f620d887946 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralNullEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralNullEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class LiteralNullEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class LiteralNullEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralStringEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralStringEditHelper.java
index 1fb4d4c0afa..ad07f6ac889 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralStringEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralStringEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class LiteralStringEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class LiteralStringEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralUnlimitedNaturalEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralUnlimitedNaturalEditHelper.java
index 3b67cf25a4e..4c4ad07550c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralUnlimitedNaturalEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/LiteralUnlimitedNaturalEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class LiteralUnlimitedNaturalEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class LiteralUnlimitedNaturalEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ManifestationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ManifestationEditHelper.java
index 92df86f907b..5891922e3b0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ManifestationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ManifestationEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class ManifestationEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class ManifestationEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/NodeEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/NodeEditHelper.java
index 94ac4cd54ac..77ff008b079 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/NodeEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/NodeEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class NodeEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class NodeEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/OpaqueBehaviorEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/OpaqueBehaviorEditHelper.java
index de9a9d53ef3..91cec4e35ad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/OpaqueBehaviorEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/OpaqueBehaviorEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class OpaqueBehaviorEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class OpaqueBehaviorEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/OpaqueExpressionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/OpaqueExpressionEditHelper.java
index 7c813a3912a..a54cb081735 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/OpaqueExpressionEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/OpaqueExpressionEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class OpaqueExpressionEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class OpaqueExpressionEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PackageEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PackageEditHelper.java
index e3f7887e5ed..abfb19c9b73 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PackageEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PackageEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class PackageEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class PackageEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ParameterEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ParameterEditHelper.java
index d02cd4f8794..be0bef80eea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ParameterEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ParameterEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class ParameterEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class ParameterEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PortEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PortEditHelper.java
index cbd371f1a7c..8b612642890 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PortEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PortEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class PortEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class PortEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PrimitiveTypeEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PrimitiveTypeEditHelper.java
index 347ef84d6f4..f64af98f954 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PrimitiveTypeEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PrimitiveTypeEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class PrimitiveTypeEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class PrimitiveTypeEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PropertyEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PropertyEditHelper.java
index 619c4eff820..27218a35775 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PropertyEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/PropertyEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class PropertyEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class PropertyEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ProtocolStateMachineEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ProtocolStateMachineEditHelper.java
index 5fffe4f098c..b63a0b7ed80 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ProtocolStateMachineEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/ProtocolStateMachineEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class ProtocolStateMachineEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class ProtocolStateMachineEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/RealizationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/RealizationEditHelper.java
index 7dbf62412ff..6cfc2ec8a5a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/RealizationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/RealizationEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class RealizationEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class RealizationEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/RoleBindingEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/RoleBindingEditHelper.java
index eaf6d7c3778..99a2d9b562c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/RoleBindingEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/RoleBindingEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class RoleBindingEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class RoleBindingEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/SignalEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/SignalEditHelper.java
index baf8986d117..95b78574fa7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/SignalEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/SignalEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class SignalEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class SignalEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/SignalEventEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/SignalEventEditHelper.java
index 7bcad94ac7f..b18bfc3be60 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/SignalEventEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/SignalEventEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class SignalEventEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class SignalEventEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/StateMachineEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/StateMachineEditHelper.java
index 2038408d1b3..18698b1af4a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/StateMachineEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/StateMachineEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class StateMachineEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class StateMachineEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/StringExpressionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/StringExpressionEditHelper.java
index 193cb4a26df..700957e86a9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/StringExpressionEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/StringExpressionEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class StringExpressionEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class StringExpressionEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/SubstitutionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/SubstitutionEditHelper.java
index 4b53a06bedb..8de42cbda0d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/SubstitutionEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/SubstitutionEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class SubstitutionEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class SubstitutionEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeConstraintEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeConstraintEditHelper.java
index 0f74d023cfc..48f87e599d2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeConstraintEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeConstraintEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class TimeConstraintEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class TimeConstraintEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeEventEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeEventEditHelper.java
index 8266ee441b7..e8ae49b182c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeEventEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeEventEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class TimeEventEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class TimeEventEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeExpressionEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeExpressionEditHelper.java
index 24425a65350..5358ac30bf8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeExpressionEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeExpressionEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class TimeExpressionEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class TimeExpressionEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeIntervalEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeIntervalEditHelper.java
index 0ea52f39057..3a34b90ac9c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeIntervalEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeIntervalEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class TimeIntervalEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class TimeIntervalEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeObservationEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeObservationEditHelper.java
index 41b9e5a5f38..2eba6fd1d04 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeObservationEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/TimeObservationEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class TimeObservationEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class TimeObservationEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/UMLBaseEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/UMLBaseEditHelper.java
index cfa8e28ef52..3c82d3d91cd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/UMLBaseEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/UMLBaseEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.gmf.tooling.runtime.edit.helpers.GeneratedEditHelperBase;
-
-/**
- * @generated
- */
-public class UMLBaseEditHelper extends GeneratedEditHelperBase {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.gmf.tooling.runtime.edit.helpers.GeneratedEditHelperBase;

+

+/**

+ * @generated

+ */

+public class UMLBaseEditHelper extends GeneratedEditHelperBase {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/UsageEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/UsageEditHelper.java
index e607bd0aa27..21e95846e22 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/UsageEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/UsageEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class UsageEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class UsageEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/UseCaseEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/UseCaseEditHelper.java
index f0e77e78b32..2e43dd6d824 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/UseCaseEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/helpers/UseCaseEditHelper.java
@@ -1,20 +1,20 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;
-
-import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;
-
-/**
- * @generated
- */
-public class UseCaseEditHelper extends UMLBaseEditHelper {
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.helpers;

+

+import org.eclipse.papyrus.uml.diagram.common.helper.UMLBaseEditHelper;

+

+/**

+ * @generated

+ */

+public class UseCaseEditHelper extends UMLBaseEditHelper {

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionAppliedStereotypeEditPart.java
index 987c00bfd5a..bf3de87b055 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionAppliedStereotypeEditPart.java
@@ -1,759 +1,752 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6020;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));
-	}
-
-	/**
-	 * @generated
-	 */
-	public AbstractionAppliedStereotypeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Abstraction_4007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionAppliedStereotypeEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		// The label is read-only (defined in GMFGen model)
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class AbstractionAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6020;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));

+	}

+

+	/**

+	 * @generated

+	 */

+	public AbstractionAppliedStereotypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Abstraction_4007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionAppliedStereotypeEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		// The label is read-only (defined in GMFGen model)

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionEditPart.java
index 2ea5afc52e2..2154b1dac90 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionEditPart.java
@@ -1,120 +1,115 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeAbstractionLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.AbstractionItemSemanticEditPolicy;
-
-/**
- * @generated
- */
-public class AbstractionEditPart extends UMLConnectionNodeEditPart
-		implements ITreeBranchEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4007;
-
-	/**
-	 * @generated
-	 */
-	public AbstractionEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new AbstractionItemSemanticEditPolicy());
-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeAbstractionLabelDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof AbstractionNameEditPart) {
-			((AbstractionNameEditPart) childEditPart).setLabel(
-					getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof AbstractionAppliedStereotypeEditPart) {
-			((AbstractionAppliedStereotypeEditPart) childEditPart).setLabel(
-					getPrimaryShape().getAppliedStereotypeLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof AbstractionNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof AbstractionAppliedStereotypeEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected Connection createConnectionFigure() {
-		return new DashedEdgeFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	public DashedEdgeFigure getPrimaryShape() {
-		return (DashedEdgeFigure) getFigure();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

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

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeAbstractionLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.AbstractionItemSemanticEditPolicy;

+

+/**

+ * @generated

+ */

+public class AbstractionEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 4007;

+

+	/**

+	 * @generated

+	 */

+	public AbstractionEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new AbstractionItemSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeAbstractionLabelDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof AbstractionNameEditPart) {

+			((AbstractionNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		}

+		if(childEditPart instanceof AbstractionAppliedStereotypeEditPart) {

+			((AbstractionAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof AbstractionNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof AbstractionAppliedStereotypeEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected Connection createConnectionFigure() {

+		return new DashedEdgeFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public DashedEdgeFigure getPrimaryShape() {

+		return (DashedEdgeFigure)getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionNameEditPart.java
index 32825d3807c..ec8dae93497 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AbstractionNameEditPart.java
@@ -1,766 +1,760 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6006;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionNameEditPart.VISUAL_ID), new Point(0, 60));
-	}
-
-	/**
-	 * @generated
-	 */
-	public AbstractionNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Abstraction_4007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class AbstractionNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6006;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionNameEditPart.VISUAL_ID), new Point(0, 60));

+	}

+

+	/**

+	 * @generated

+	 */

+	public AbstractionNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Abstraction_4007, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPart.java
index 53370d5571d..7f09c5d8868 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPart.java
@@ -1,132 +1,126 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ActivityCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class ActivityCompositeCompartmentEditPart
-		extends ShapeCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7063;
-
-	/**
-	 * @generated
-	 */
-	public ActivityCompositeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.ActivityCompositeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ActivityCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ActivityCompositeCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class ActivityCompositeCompartmentEditPart extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7063;

+

+	/**

+	 * @generated

+	 */

+	public ActivityCompositeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ActivityCompositeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ActivityCompositeCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPartCN.java
index 9d1218debf7..a459a1913ce 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeCompartmentEditPartCN.java
@@ -1,132 +1,126 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ActivityCompositeCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class ActivityCompositeCompartmentEditPartCN
-		extends ShapeCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7050;
-
-	/**
-	 * @generated
-	 */
-	public ActivityCompositeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.ActivityCompositeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ActivityCompositeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ActivityCompositeCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class ActivityCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7050;

+

+	/**

+	 * @generated

+	 */

+	public ActivityCompositeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ActivityCompositeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ActivityCompositeCompartmentItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPart.java
index 018fd4ecd06..f7928409a73 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPart.java
@@ -1,312 +1,332 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ActivityCompositeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ActivityCompositeItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class ActivityCompositeEditPart extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2060;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ActivityCompositeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ActivityCompositeItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				switch (UMLVisualIDRegistry.getVisualID(childView)) {
-				case PortEditPart.VISUAL_ID:
-				case ParameterEditPart.VISUAL_ID:
-					return new BorderItemResizableEditPolicy();
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new ActivityCompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ActivityCompositeFigure
-	 * @generated
-	 */
-	public ActivityCompositeFigure getPrimaryShape() {
-		return (ActivityCompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ActivityCompositeNameEditPart) {
-			((ActivityCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof ActivityCompositeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((ActivityCompositeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof ParameterEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ActivityCompositeNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof ActivityCompositeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((ActivityCompositeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof ParameterEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof ActivityCompositeCompartmentEditPart) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createMainFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ActivityCompositeNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ActivityCompositeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ActivityCompositeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class ActivityCompositeEditPart extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2060;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ActivityCompositeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ActivityCompositeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case PortEditPart.VISUAL_ID:

+				case ParameterEditPart.VISUAL_ID:

+					return new BorderItemResizableEditPolicy();

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new ActivityCompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ActivityCompositeFigure

+	 * 

+	 * @generated

+	 */

+	public ActivityCompositeFigure getPrimaryShape() {

+		return (ActivityCompositeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ActivityCompositeNameEditPart) {

+			((ActivityCompositeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof ActivityCompositeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ActivityCompositeCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof ParameterEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ActivityCompositeNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof ActivityCompositeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((ActivityCompositeCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof ParameterEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof ActivityCompositeCompartmentEditPart) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		if(editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ActivityCompositeNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPartCN.java
index 75d37a3af9d..fdfa79b12a2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeEditPartCN.java
@@ -1,312 +1,332 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ActivityCompositeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ActivityCompositeItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class ActivityCompositeEditPartCN extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3072;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ActivityCompositeEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ActivityCompositeItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				switch (UMLVisualIDRegistry.getVisualID(childView)) {
-				case PortEditPart.VISUAL_ID:
-				case ParameterEditPart.VISUAL_ID:
-					return new BorderItemResizableEditPolicy();
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new ActivityCompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ActivityCompositeFigure
-	 * @generated
-	 */
-	public ActivityCompositeFigure getPrimaryShape() {
-		return (ActivityCompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ActivityCompositeNameEditPartCN) {
-			((ActivityCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof ActivityCompositeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((ActivityCompositeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof ParameterEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ActivityCompositeNameEditPartCN) {
-			return true;
-		}
-		if (childEditPart instanceof ActivityCompositeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((ActivityCompositeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof ParameterEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof ActivityCompositeCompartmentEditPartCN) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createMainFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ActivityCompositeNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ActivityCompositeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ActivityCompositeItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class ActivityCompositeEditPartCN extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3072;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ActivityCompositeEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ActivityCompositeItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case PortEditPart.VISUAL_ID:

+				case ParameterEditPart.VISUAL_ID:

+					return new BorderItemResizableEditPolicy();

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new ActivityCompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ActivityCompositeFigure

+	 * 

+	 * @generated

+	 */

+	public ActivityCompositeFigure getPrimaryShape() {

+		return (ActivityCompositeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ActivityCompositeNameEditPartCN) {

+			((ActivityCompositeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof ActivityCompositeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ActivityCompositeCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof ParameterEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ActivityCompositeNameEditPartCN) {

+			return true;

+		}

+		if(childEditPart instanceof ActivityCompositeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((ActivityCompositeCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof ParameterEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof ActivityCompositeCompartmentEditPartCN) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		if(editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ActivityCompositeNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPart.java
index 03db6103ce6..b7cfa3ea6f0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5112;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ActivityCompositeNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Activity_2060, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActivityCompositeNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ActivityCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5112;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ActivityCompositeNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Activity_2060, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActivityCompositeNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPartCN.java
index ccbeebf03c0..9b2c280e66e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActivityCompositeNameEditPartCN.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5128;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ActivityCompositeNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Activity_3072, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActivityCompositeNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ActivityCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5128;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ActivityCompositeNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Activity_3072, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActivityCompositeNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPart.java
index 1580a2375f4..3acf0efe8a5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPart.java
@@ -1,241 +1,250 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ActorItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class ActorEditPart extends NodeEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2077;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ActorEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ActorItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeNamedElementFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 * @generated
-	 */
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ActorNameEditPart) {
-			((ActorNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ActorNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ActorNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ActorItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class ActorEditPart extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2077;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ActorEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ActorItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeNamedElementFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 * 

+	 * @generated

+	 */

+	public NodeNamedElementFigure getPrimaryShape() {

+		return (NodeNamedElementFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ActorNameEditPart) {

+			((ActorNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ActorNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ActorNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPartCN.java
index c8c9149c638..3407815d3e7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorEditPartCN.java
@@ -1,241 +1,250 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ActorItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class ActorEditPartCN extends NodeEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3091;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ActorEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ActorItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeNamedElementFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 * @generated
-	 */
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ActorNameEditPartCN) {
-			((ActorNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ActorNameEditPartCN) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ActorNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ActorItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class ActorEditPartCN extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3091;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ActorEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ActorItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeNamedElementFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 * 

+	 * @generated

+	 */

+	public NodeNamedElementFigure getPrimaryShape() {

+		return (NodeNamedElementFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ActorNameEditPartCN) {

+			((ActorNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ActorNameEditPartCN) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ActorNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPart.java
index 5eb52f535ed..26fd446fcf7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5160;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ActorNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_2077, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActorNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ActorNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5160;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ActorNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_2077, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActorNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPartCN.java
index 3085fc298a2..78b056563ef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ActorNameEditPartCN.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5144;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ActorNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_3091, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActorNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ActorNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5144;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ActorNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Actor_3091, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ActorNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventEditPart.java
index 2db06172799..65e46e1d8be 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventEditPart.java
@@ -1,239 +1,248 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.AnyReceiveEventItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class AnyReceiveEventEditPart extends NodeEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2085;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public AnyReceiveEventEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new AnyReceiveEventItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeNamedElementFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 * @generated
-	 */
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof AnyReceiveEventNameEditPart) {
-			((AnyReceiveEventNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof AnyReceiveEventNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(AnyReceiveEventNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.AnyReceiveEventItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class AnyReceiveEventEditPart extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2085;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public AnyReceiveEventEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new AnyReceiveEventItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeNamedElementFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 * 

+	 * @generated

+	 */

+	public NodeNamedElementFigure getPrimaryShape() {

+		return (NodeNamedElementFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof AnyReceiveEventNameEditPart) {

+			((AnyReceiveEventNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof AnyReceiveEventNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(AnyReceiveEventNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventNameEditPart.java
index d458bb86afc..d48634fe129 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/AnyReceiveEventNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5168;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public AnyReceiveEventNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.AnyReceiveEvent_2085, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.AnyReceiveEventNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class AnyReceiveEventNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5168;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public AnyReceiveEventNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.AnyReceiveEvent_2085, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.AnyReceiveEventNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPart.java
index b4732f14d7d..163c0413f2f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPart.java
@@ -1,241 +1,250 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ArtifactItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class ArtifactEditPart extends NodeEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2079;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ArtifactEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ArtifactItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeNamedElementFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 * @generated
-	 */
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ArtifactNameEditPart) {
-			((ArtifactNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ArtifactNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ArtifactNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ArtifactItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class ArtifactEditPart extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2079;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ArtifactEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ArtifactItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeNamedElementFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 * 

+	 * @generated

+	 */

+	public NodeNamedElementFigure getPrimaryShape() {

+		return (NodeNamedElementFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ArtifactNameEditPart) {

+			((ArtifactNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ArtifactNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ArtifactNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPartCN.java
index 8f4331250cc..f0e98535dae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactEditPartCN.java
@@ -1,241 +1,250 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ArtifactItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class ArtifactEditPartCN extends NodeEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3093;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ArtifactEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ArtifactItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeNamedElementFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 * @generated
-	 */
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ArtifactNameEditPartCN) {
-			((ArtifactNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ArtifactNameEditPartCN) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ArtifactNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ArtifactItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class ArtifactEditPartCN extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3093;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ArtifactEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ArtifactItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeNamedElementFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 * 

+	 * @generated

+	 */

+	public NodeNamedElementFigure getPrimaryShape() {

+		return (NodeNamedElementFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ArtifactNameEditPartCN) {

+			((ArtifactNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ArtifactNameEditPartCN) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ArtifactNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPart.java
index 4d294693705..2e65229a461 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5162;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ArtifactNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Artifact_2079, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ArtifactNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ArtifactNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5162;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ArtifactNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Artifact_2079, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ArtifactNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPartCN.java
index 97e0e5f765e..a4838e4c2b7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ArtifactNameEditPartCN.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5146;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ArtifactNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Artifact_3093, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ArtifactNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ArtifactNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5146;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ArtifactNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Artifact_3093, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ArtifactNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortEditPart.java
index 47953816ffe..e3114e919fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortEditPart.java
@@ -1,183 +1,192 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusRoundedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.parts.AbstractBehaviorPortEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorSymbolEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.NoConnectableEditPolicy;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class BehaviorPortEditPart extends AbstractBehaviorPortEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3121;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public BehaviorPortEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		removeEditPolicy(EditPolicyRoles.SEMANTIC_ROLE);
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(BehaviorSymbolEditPolicy.BEHAVIOR_SYMBOL, new BehaviorSymbolEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new NoConnectableEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new PapyrusRoundedNodeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusRoundedNodeFigure
-	 * @generated
-	 */
-	public PapyrusRoundedNodeFigure getPrimaryShape() {
-		return (PapyrusRoundedNodeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusRoundedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.parts.AbstractBehaviorPortEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorSymbolEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.NoConnectableEditPolicy;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class BehaviorPortEditPart extends AbstractBehaviorPortEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3121;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public BehaviorPortEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		removeEditPolicy(EditPolicyRoles.SEMANTIC_ROLE);

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(BehaviorSymbolEditPolicy.BEHAVIOR_SYMBOL, new BehaviorSymbolEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new NoConnectableEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new PapyrusRoundedNodeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.PapyrusRoundedNodeFigure

+	 * 

+	 * @generated

+	 */

+	public PapyrusRoundedNodeFigure getPrimaryShape() {

+		return (PapyrusRoundedNodeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortLinkEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortLinkEditPart.java
index d7ed3cc345c..d84d1ba272a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortLinkEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/BehaviorPortLinkEditPart.java
@@ -1,72 +1,71 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ViewComponentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.NoConnectableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.NoDeleteFromDiagramEditPolicy;
-
-/**
- * @generated
- */
-public class BehaviorPortLinkEditPart extends ConnectionEditPart
-		implements ITreeBranchEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4022;
-
-	/**
-	 * @generated
-	 */
-	public BehaviorPortLinkEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ViewComponentEditPolicy());
-		removeEditPolicy(EditPolicyRoles.SEMANTIC_ROLE);
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new NoConnectableEditPolicy());
-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new NoDeleteFromDiagramEditPolicy());
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected Connection createConnectionFigure() {
-		return new PolylineConnectionEx();
-	}
-
-	/**
-	 * @generated
-	 */
-	public PolylineConnectionEx getPrimaryShape() {
-		return (PolylineConnectionEx) getFigure();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ViewComponentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.NoConnectableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.NoDeleteFromDiagramEditPolicy;

+

+/**

+ * @generated

+ */

+public class BehaviorPortLinkEditPart extends ConnectionEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 4022;

+

+	/**

+	 * @generated

+	 */

+	public BehaviorPortLinkEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ViewComponentEditPolicy());

+		removeEditPolicy(EditPolicyRoles.SEMANTIC_ROLE);

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new NoConnectableEditPolicy());

+		installEditPolicy(EditPolicy.COMPONENT_ROLE, new NoDeleteFromDiagramEditPolicy());

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected Connection createConnectionFigure() {

+		return new PolylineConnectionEx();

+	}

+

+	/**

+	 * @generated

+	 */

+	public PolylineConnectionEx getPrimaryShape() {

+		return (PolylineConnectionEx)getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventEditPart.java
index e679fe11b86..d2a76f55916 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventEditPart.java
@@ -1,239 +1,248 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CallEventItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class CallEventEditPart extends NodeEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2084;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public CallEventEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CallEventItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeNamedElementFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 * @generated
-	 */
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof CallEventNameEditPart) {
-			((CallEventNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof CallEventNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CallEventNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CallEventItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class CallEventEditPart extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2084;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public CallEventEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CallEventItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeNamedElementFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 * 

+	 * @generated

+	 */

+	public NodeNamedElementFigure getPrimaryShape() {

+		return (NodeNamedElementFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof CallEventNameEditPart) {

+			((CallEventNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof CallEventNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CallEventNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventNameEditPart.java
index d1638886b65..ac9abdc79c6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CallEventNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5167;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public CallEventNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.CallEvent_2084, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CallEventNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class CallEventNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5167;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public CallEventNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.CallEvent_2084, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CallEventNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventEditPart.java
index 2ac6a4a9138..468acc2b47e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventEditPart.java
@@ -1,239 +1,248 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ChangeEventItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class ChangeEventEditPart extends NodeEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2088;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ChangeEventEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ChangeEventItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeNamedElementFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 * @generated
-	 */
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ChangeEventNameEditPart) {
-			((ChangeEventNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ChangeEventNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ChangeEventNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ChangeEventItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class ChangeEventEditPart extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2088;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ChangeEventEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ChangeEventItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeNamedElementFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 * 

+	 * @generated

+	 */

+	public NodeNamedElementFigure getPrimaryShape() {

+		return (NodeNamedElementFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ChangeEventNameEditPart) {

+			((ChangeEventNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ChangeEventNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ChangeEventNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventNameEditPart.java
index ac60a18dafb..28155765930 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ChangeEventNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5171;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ChangeEventNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.ChangeEvent_2088, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ChangeEventNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ChangeEventNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5171;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ChangeEventNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.ChangeEvent_2088, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ChangeEventNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPart.java
index d1f06cd6850..144515e1867 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPart.java
@@ -1,132 +1,126 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ClassCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class ClassCompositeCompartmentEditPart
-		extends ShapeCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7073;
-
-	/**
-	 * @generated
-	 */
-	public ClassCompositeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.ClassCompositeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ClassCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ClassCompositeCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class ClassCompositeCompartmentEditPart extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7073;

+

+	/**

+	 * @generated

+	 */

+	public ClassCompositeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ClassCompositeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ClassCompositeCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPartCN.java
index bb4e574eca6..9638019916f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeCompartmentEditPartCN.java
@@ -1,132 +1,126 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ClassCompositeCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class ClassCompositeCompartmentEditPartCN
-		extends ShapeCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7060;
-
-	/**
-	 * @generated
-	 */
-	public ClassCompositeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.ClassCompositeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ClassCompositeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ClassCompositeCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class ClassCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7060;

+

+	/**

+	 * @generated

+	 */

+	public ClassCompositeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ClassCompositeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ClassCompositeCompartmentItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPart.java
index ece41627316..6904c70cdc2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPart.java
@@ -1,303 +1,319 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ClassCompositeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ClassCompositeItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class ClassCompositeEditPart extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2073;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ClassCompositeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ClassCompositeItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				switch (UMLVisualIDRegistry.getVisualID(childView)) {
-				case PortEditPart.VISUAL_ID:
-					return new BorderItemResizableEditPolicy();
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new ClassCompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ClassCompositeFigure
-	 * @generated
-	 */
-	public ClassCompositeFigure getPrimaryShape() {
-		return (ClassCompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ClassCompositeNameEditPart) {
-			((ClassCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof ClassCompositeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((ClassCompositeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ClassCompositeNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof ClassCompositeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((ClassCompositeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof ClassCompositeCompartmentEditPart) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createMainFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassCompositeNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ClassCompositeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ClassCompositeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class ClassCompositeEditPart extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2073;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ClassCompositeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ClassCompositeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case PortEditPart.VISUAL_ID:

+					return new BorderItemResizableEditPolicy();

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new ClassCompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ClassCompositeFigure

+	 * 

+	 * @generated

+	 */

+	public ClassCompositeFigure getPrimaryShape() {

+		return (ClassCompositeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ClassCompositeNameEditPart) {

+			((ClassCompositeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof ClassCompositeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ClassCompositeCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ClassCompositeNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof ClassCompositeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((ClassCompositeCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof ClassCompositeCompartmentEditPart) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		if(editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassCompositeNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPartCN.java
index d434b43c92f..884b9a09b44 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeEditPartCN.java
@@ -1,303 +1,319 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ClassCompositeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ClassCompositeItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class ClassCompositeEditPartCN extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3085;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ClassCompositeEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ClassCompositeItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				switch (UMLVisualIDRegistry.getVisualID(childView)) {
-				case PortEditPart.VISUAL_ID:
-					return new BorderItemResizableEditPolicy();
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new ClassCompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ClassCompositeFigure
-	 * @generated
-	 */
-	public ClassCompositeFigure getPrimaryShape() {
-		return (ClassCompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ClassCompositeNameEditPartCN) {
-			((ClassCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof ClassCompositeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((ClassCompositeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ClassCompositeNameEditPartCN) {
-			return true;
-		}
-		if (childEditPart instanceof ClassCompositeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((ClassCompositeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof ClassCompositeCompartmentEditPartCN) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createMainFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassCompositeNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ClassCompositeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ClassCompositeItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class ClassCompositeEditPartCN extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3085;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ClassCompositeEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ClassCompositeItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case PortEditPart.VISUAL_ID:

+					return new BorderItemResizableEditPolicy();

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new ClassCompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ClassCompositeFigure

+	 * 

+	 * @generated

+	 */

+	public ClassCompositeFigure getPrimaryShape() {

+		return (ClassCompositeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ClassCompositeNameEditPartCN) {

+			((ClassCompositeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof ClassCompositeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ClassCompositeCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ClassCompositeNameEditPartCN) {

+			return true;

+		}

+		if(childEditPart instanceof ClassCompositeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((ClassCompositeCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof ClassCompositeCompartmentEditPartCN) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		if(editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassCompositeNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPart.java
index 9b202d3fe07..55d64054f94 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5156;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ClassCompositeNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Class_2073, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ClassCompositeNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ClassCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5156;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ClassCompositeNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Class_2073, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ClassCompositeNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPartCN.java
index baf9e7a57a0..fc23a3c09ca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ClassCompositeNameEditPartCN.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5155;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ClassCompositeNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Class_3085, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ClassCompositeNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ClassCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5155;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ClassCompositeNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Class_3085, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ClassCompositeNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPart.java
index 53ec000d7fa..7713f230eab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPart.java
@@ -1,132 +1,126 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomCollaborationCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CollaborationCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class CollaborationCompositeCompartmentEditPart
-		extends ShapeCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7075;
-
-	/**
-	 * @generated
-	 */
-	public CollaborationCompositeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.CollaborationCompositeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CollaborationCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomCollaborationCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomCollaborationCompositeCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CollaborationCompositeCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class CollaborationCompositeCompartmentEditPart extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7075;

+

+	/**

+	 * @generated

+	 */

+	public CollaborationCompositeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.CollaborationCompositeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CollaborationCompositeCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomCollaborationCompositeCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPartCN.java
index f176d5b4a49..09980f5cae1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeCompartmentEditPartCN.java
@@ -1,132 +1,126 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomCollaborationCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CollaborationCompositeCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class CollaborationCompositeCompartmentEditPartCN
-		extends ShapeCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7061;
-
-	/**
-	 * @generated
-	 */
-	public CollaborationCompositeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.CollaborationCompositeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CollaborationCompositeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomCollaborationCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomCollaborationCompositeCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CollaborationCompositeCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class CollaborationCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7061;

+

+	/**

+	 * @generated

+	 */

+	public CollaborationCompositeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.CollaborationCompositeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CollaborationCompositeCompartmentItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomCollaborationCompositeCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPart.java
index 56220f7499c..eab433569d8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPart.java
@@ -1,268 +1,280 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationCompositeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CollaborationCompositeItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class CollaborationCompositeEditPart extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2075;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public CollaborationCompositeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CollaborationCompositeItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new CollaborationCompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationCompositeFigure
-	 * @generated
-	 */
-	public CollaborationCompositeFigure getPrimaryShape() {
-		return (CollaborationCompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof CollaborationCompositeNameEditPart) {
-			((CollaborationCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof CollaborationCompositeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((CollaborationCompositeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof CollaborationCompositeNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof CollaborationCompositeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((CollaborationCompositeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof CollaborationCompositeCompartmentEditPart) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CollaborationCompositeNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationCompositeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CollaborationCompositeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class CollaborationCompositeEditPart extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2075;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public CollaborationCompositeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CollaborationCompositeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new CollaborationCompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationCompositeFigure

+	 * 

+	 * @generated

+	 */

+	public CollaborationCompositeFigure getPrimaryShape() {

+		return (CollaborationCompositeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof CollaborationCompositeNameEditPart) {

+			((CollaborationCompositeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof CollaborationCompositeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((CollaborationCompositeCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof CollaborationCompositeNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof CollaborationCompositeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((CollaborationCompositeCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof CollaborationCompositeCompartmentEditPart) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CollaborationCompositeNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPartCN.java
index 85d6d466bb3..436a3094a68 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeEditPartCN.java
@@ -1,268 +1,280 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationCompositeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CollaborationCompositeItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class CollaborationCompositeEditPartCN extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3086;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public CollaborationCompositeEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CollaborationCompositeItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new CollaborationCompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationCompositeFigure
-	 * @generated
-	 */
-	public CollaborationCompositeFigure getPrimaryShape() {
-		return (CollaborationCompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof CollaborationCompositeNameEditPartCN) {
-			((CollaborationCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof CollaborationCompositeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((CollaborationCompositeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof CollaborationCompositeNameEditPartCN) {
-			return true;
-		}
-		if (childEditPart instanceof CollaborationCompositeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((CollaborationCompositeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof CollaborationCompositeCompartmentEditPartCN) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CollaborationCompositeNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationCompositeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CollaborationCompositeItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class CollaborationCompositeEditPartCN extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3086;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public CollaborationCompositeEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CollaborationCompositeItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new CollaborationCompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationCompositeFigure

+	 * 

+	 * @generated

+	 */

+	public CollaborationCompositeFigure getPrimaryShape() {

+		return (CollaborationCompositeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof CollaborationCompositeNameEditPartCN) {

+			((CollaborationCompositeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof CollaborationCompositeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((CollaborationCompositeCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof CollaborationCompositeNameEditPartCN) {

+			return true;

+		}

+		if(childEditPart instanceof CollaborationCompositeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((CollaborationCompositeCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof CollaborationCompositeCompartmentEditPartCN) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CollaborationCompositeNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPart.java
index 400224b6b46..d3536a4442e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5158;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public CollaborationCompositeNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Collaboration_2075, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationCompositeNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class CollaborationCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5158;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public CollaborationCompositeNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Collaboration_2075, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationCompositeNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPartCN.java
index 286a542cf0c..1be8fb349eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationCompositeNameEditPartCN.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5141;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public CollaborationCompositeNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Collaboration_3086, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationCompositeNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class CollaborationCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5141;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public CollaborationCompositeNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Collaboration_3086, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationCompositeNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleEditPartCN.java
index df683697615..5daada2070d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleEditPartCN.java
@@ -1,252 +1,263 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CollaborationRoleItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationRoleFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CollaborationRoleItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class CollaborationRoleEditPartCN extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3115;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public CollaborationRoleEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CollaborationRoleItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CollaborationRoleItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new CollaborationRoleFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationRoleFigure
-	 * @generated
-	 */
-	public CollaborationRoleFigure getPrimaryShape() {
-		return (CollaborationRoleFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof CollaborationRoleNameEditPartCN) {
-			((CollaborationRoleNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof CollaborationRoleNameEditPartCN) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CollaborationRoleNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CollaborationRoleItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationRoleFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CollaborationRoleItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class CollaborationRoleEditPartCN extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3115;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public CollaborationRoleEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CollaborationRoleItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CollaborationRoleItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new CollaborationRoleFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationRoleFigure

+	 * 

+	 * @generated

+	 */

+	public CollaborationRoleFigure getPrimaryShape() {

+		return (CollaborationRoleFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof CollaborationRoleNameEditPartCN) {

+			((CollaborationRoleNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof CollaborationRoleNameEditPartCN) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CollaborationRoleNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleNameEditPartCN.java
index 3fd2ff16534..e4675b6ed62 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationRoleNameEditPartCN.java
@@ -1,814 +1,810 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5198;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public CollaborationRoleNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.ConnectableElement_3115, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationRoleNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		// The label is read-only (defined in GMFGen model)
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class CollaborationRoleNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5198;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public CollaborationRoleNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.ConnectableElement_3115, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationRoleNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		// The label is read-only (defined in GMFGen model)

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseEditPartCN.java
index 1fddb7fccf2..2be03b48288 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseEditPartCN.java
@@ -1,252 +1,263 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomCollaborationUseItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationUseFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CollaborationUseItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class CollaborationUseEditPartCN extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3071;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public CollaborationUseEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CollaborationUseItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomCollaborationUseItemSemanticEditPolicyCN());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new CollaborationUseFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationUseFigure
-	 * @generated
-	 */
-	public CollaborationUseFigure getPrimaryShape() {
-		return (CollaborationUseFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof CollaborationUseNameEditPart) {
-			((CollaborationUseNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof CollaborationUseNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CollaborationUseNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomCollaborationUseItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationUseFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CollaborationUseItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class CollaborationUseEditPartCN extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3071;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public CollaborationUseEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CollaborationUseItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomCollaborationUseItemSemanticEditPolicyCN());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new CollaborationUseFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.CollaborationUseFigure

+	 * 

+	 * @generated

+	 */

+	public CollaborationUseFigure getPrimaryShape() {

+		return (CollaborationUseFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof CollaborationUseNameEditPart) {

+			((CollaborationUseNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof CollaborationUseNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CollaborationUseNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseNameEditPart.java
index 458799e4cb6..dad18deef6b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CollaborationUseNameEditPart.java
@@ -1,823 +1,820 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CollaborationUseLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5127;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public CollaborationUseNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new CollaborationUseLabelEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.CollaborationUse_3071, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationUseNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CollaborationUseLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class CollaborationUseNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5127;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public CollaborationUseNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new CollaborationUseLabelEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.CollaborationUse_3071, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CollaborationUseNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentAnnotatedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentAnnotatedElementEditPart.java
index d91e3d4f036..7613115e57f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentAnnotatedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentAnnotatedElementEditPart.java
@@ -1,66 +1,65 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;
-import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CommentAnnotatedElementItemSemanticEditPolicy;
-
-/**
- * @generated
- */
-public class CommentAnnotatedElementEditPart extends ConnectionEditPart
-		implements ITreeBranchEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4002;
-
-	/**
-	 * @generated
-	 */
-	public CommentAnnotatedElementEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CommentAnnotatedElementItemSemanticEditPolicy());
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected Connection createConnectionFigure() {
-		return new SimpleDashedEdgeFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	public SimpleDashedEdgeFigure getPrimaryShape() {
-		return (SimpleDashedEdgeFigure) getFigure();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CommentAnnotatedElementItemSemanticEditPolicy;

+

+/**

+ * @generated

+ */

+public class CommentAnnotatedElementEditPart extends ConnectionEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 4002;

+

+	/**

+	 * @generated

+	 */

+	public CommentAnnotatedElementEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CommentAnnotatedElementItemSemanticEditPolicy());

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected Connection createConnectionFigure() {

+		return new SimpleDashedEdgeFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public SimpleDashedEdgeFigure getPrimaryShape() {

+		return (SimpleDashedEdgeFigure)getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPart.java
index c199f17eec5..06a957f94ab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPart.java
@@ -1,804 +1,801 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5192;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public CommentBodyEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Comment_2109, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentBodyEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class CommentBodyEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5192;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public CommentBodyEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Comment_2109, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentBodyEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPartCN.java
index 9c3cdc4f71a..3933301ef07 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentBodyEditPartCN.java
@@ -1,804 +1,801 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5150;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public CommentBodyEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Comment_3097, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentBodyEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class CommentBodyEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5150;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public CommentBodyEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Comment_3097, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentBodyEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPart.java
index f02dda41426..81e1cae987b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPart.java
@@ -1,246 +1,257 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CommentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class CommentEditPart extends AbstractCommentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2109;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public CommentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CommentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new HTMLCornerBentFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure
-	 * @generated
-	 */
-	public HTMLCornerBentFigure getPrimaryShape() {
-		return (HTMLCornerBentFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof CommentBodyEditPart) {
-			((CommentBodyEditPart) childEditPart).setLabel(getPrimaryShape().getCornerBentFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof CommentBodyEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CommentBodyEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CommentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class CommentEditPart extends AbstractCommentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2109;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public CommentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CommentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new HTMLCornerBentFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure

+	 * 

+	 * @generated

+	 */

+	public HTMLCornerBentFigure getPrimaryShape() {

+		return (HTMLCornerBentFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof CommentBodyEditPart) {

+			((CommentBodyEditPart)childEditPart).setLabel(getPrimaryShape().getCornerBentFigure());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof CommentBodyEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CommentBodyEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPartCN.java
index 1f504564e6e..e224bfe5b7c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CommentEditPartCN.java
@@ -1,246 +1,257 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CommentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class CommentEditPartCN extends AbstractCommentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3097;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public CommentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CommentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new HTMLCornerBentFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure
-	 * @generated
-	 */
-	public HTMLCornerBentFigure getPrimaryShape() {
-		return (HTMLCornerBentFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof CommentBodyEditPartCN) {
-			((CommentBodyEditPartCN) childEditPart).setLabel(getPrimaryShape().getCornerBentFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof CommentBodyEditPartCN) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CommentBodyEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractCommentEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CommentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class CommentEditPartCN extends AbstractCommentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3097;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public CommentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CommentItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new HTMLCornerBentFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.HTMLCornerBentFigure

+	 * 

+	 * @generated

+	 */

+	public HTMLCornerBentFigure getPrimaryShape() {

+		return (HTMLCornerBentFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof CommentBodyEditPartCN) {

+			((CommentBodyEditPartCN)childEditPart).setLabel(getPrimaryShape().getCornerBentFigure());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof CommentBodyEditPartCN) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(CommentBodyEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPart.java
index 5266387d1a1..9b641debf32 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPart.java
@@ -1,132 +1,126 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ComponentCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class ComponentCompositeCompartmentEditPart
-		extends ShapeCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7069;
-
-	/**
-	 * @generated
-	 */
-	public ComponentCompositeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.ComponentCompositeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ComponentCompositeCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class ComponentCompositeCompartmentEditPart extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7069;

+

+	/**

+	 * @generated

+	 */

+	public ComponentCompositeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ComponentCompositeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentCompositeCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPartCN.java
index 8b7503ef57e..c75a049855b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeCompartmentEditPartCN.java
@@ -1,132 +1,126 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ComponentCompositeCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class ComponentCompositeCompartmentEditPartCN
-		extends ShapeCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7056;
-
-	/**
-	 * @generated
-	 */
-	public ComponentCompositeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.ComponentCompositeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentCompositeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ComponentCompositeCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class ComponentCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7056;

+

+	/**

+	 * @generated

+	 */

+	public ComponentCompositeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ComponentCompositeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentCompositeCompartmentItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPart.java
index 9f000820438..608cda77ea9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPart.java
@@ -1,303 +1,319 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ComponentCompositeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ComponentCompositeItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class ComponentCompositeEditPart extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2069;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ComponentCompositeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentCompositeItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				switch (UMLVisualIDRegistry.getVisualID(childView)) {
-				case PortEditPart.VISUAL_ID:
-					return new BorderItemResizableEditPolicy();
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new ComponentCompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ComponentCompositeFigure
-	 * @generated
-	 */
-	public ComponentCompositeFigure getPrimaryShape() {
-		return (ComponentCompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ComponentCompositeNameEditPart) {
-			((ComponentCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof ComponentCompositeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((ComponentCompositeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ComponentCompositeNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof ComponentCompositeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((ComponentCompositeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof ComponentCompositeCompartmentEditPart) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createMainFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentCompositeNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ComponentCompositeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ComponentCompositeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class ComponentCompositeEditPart extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2069;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ComponentCompositeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentCompositeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case PortEditPart.VISUAL_ID:

+					return new BorderItemResizableEditPolicy();

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new ComponentCompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ComponentCompositeFigure

+	 * 

+	 * @generated

+	 */

+	public ComponentCompositeFigure getPrimaryShape() {

+		return (ComponentCompositeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ComponentCompositeNameEditPart) {

+			((ComponentCompositeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof ComponentCompositeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ComponentCompositeCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ComponentCompositeNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof ComponentCompositeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((ComponentCompositeCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof ComponentCompositeCompartmentEditPart) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		if(editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentCompositeNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPartCN.java
index 975964c3428..29c096d58b0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeEditPartCN.java
@@ -1,303 +1,319 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ComponentCompositeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ComponentCompositeItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class ComponentCompositeEditPartCN extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3081;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ComponentCompositeEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentCompositeItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				switch (UMLVisualIDRegistry.getVisualID(childView)) {
-				case PortEditPart.VISUAL_ID:
-					return new BorderItemResizableEditPolicy();
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new ComponentCompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ComponentCompositeFigure
-	 * @generated
-	 */
-	public ComponentCompositeFigure getPrimaryShape() {
-		return (ComponentCompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ComponentCompositeNameEditPartCN) {
-			((ComponentCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof ComponentCompositeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((ComponentCompositeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ComponentCompositeNameEditPartCN) {
-			return true;
-		}
-		if (childEditPart instanceof ComponentCompositeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((ComponentCompositeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof ComponentCompositeCompartmentEditPartCN) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createMainFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentCompositeNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ComponentCompositeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ComponentCompositeItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class ComponentCompositeEditPartCN extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3081;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ComponentCompositeEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentCompositeItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case PortEditPart.VISUAL_ID:

+					return new BorderItemResizableEditPolicy();

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new ComponentCompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ComponentCompositeFigure

+	 * 

+	 * @generated

+	 */

+	public ComponentCompositeFigure getPrimaryShape() {

+		return (ComponentCompositeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ComponentCompositeNameEditPartCN) {

+			((ComponentCompositeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof ComponentCompositeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ComponentCompositeCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ComponentCompositeNameEditPartCN) {

+			return true;

+		}

+		if(childEditPart instanceof ComponentCompositeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((ComponentCompositeCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof ComponentCompositeCompartmentEditPartCN) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		if(editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentCompositeNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPart.java
index 1474a17ee18..6d959620204 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5121;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ComponentCompositeNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Component_2069, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentCompositeNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ComponentCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5121;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ComponentCompositeNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Component_2069, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentCompositeNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPartCN.java
index de54f34d004..ea57c2434fa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentCompositeNameEditPartCN.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5137;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ComponentCompositeNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Component_3081, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentCompositeNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ComponentCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5137;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ComponentCompositeNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Component_3081, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentCompositeNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java
index 0784e63628b..acd91e2cd51 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationAppliedStereotypeEditPart.java
@@ -1,759 +1,752 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6015;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ComponentRealizationAppliedStereotypeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.ComponentRealization_4004, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		// The label is read-only (defined in GMFGen model)
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ComponentRealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6015;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ComponentRealizationAppliedStereotypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.ComponentRealization_4004, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		// The label is read-only (defined in GMFGen model)

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationEditPart.java
index faf8e386422..629e6c2f70a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationEditPart.java
@@ -1,119 +1,114 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ComponentRealizationItemSemanticEditPolicy;
-
-/**
- * @generated
- */
-public class ComponentRealizationEditPart extends UMLConnectionNodeEditPart
-		implements ITreeBranchEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4004;
-
-	/**
-	 * @generated
-	 */
-	public ComponentRealizationEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentRealizationItemSemanticEditPolicy());
-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ComponentRealizationNameEditPart) {
-			((ComponentRealizationNameEditPart) childEditPart).setLabel(
-					getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof ComponentRealizationAppliedStereotypeEditPart) {
-			((ComponentRealizationAppliedStereotypeEditPart) childEditPart).setLabel(
-					getPrimaryShape().getAppliedStereotypeLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ComponentRealizationNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof ComponentRealizationAppliedStereotypeEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected Connection createConnectionFigure() {
-		return new InterfaceRealizationFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	public InterfaceRealizationFigure getPrimaryShape() {
-		return (InterfaceRealizationFigure) getFigure();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

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

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ComponentRealizationItemSemanticEditPolicy;

+

+/**

+ * @generated

+ */

+public class ComponentRealizationEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 4004;

+

+	/**

+	 * @generated

+	 */

+	public ComponentRealizationEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ComponentRealizationItemSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ComponentRealizationNameEditPart) {

+			((ComponentRealizationNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		}

+		if(childEditPart instanceof ComponentRealizationAppliedStereotypeEditPart) {

+			((ComponentRealizationAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ComponentRealizationNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof ComponentRealizationAppliedStereotypeEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected Connection createConnectionFigure() {

+		return new InterfaceRealizationFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public InterfaceRealizationFigure getPrimaryShape() {

+		return (InterfaceRealizationFigure)getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationNameEditPart.java
index bf4acb1d2d0..1f1980e1e95 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ComponentRealizationNameEditPart.java
@@ -1,766 +1,760 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6001;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationNameEditPart.VISUAL_ID), new Point(0, 60));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ComponentRealizationNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.ComponentRealization_4004, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ComponentRealizationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6001;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationNameEditPart.VISUAL_ID), new Point(0, 60));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ComponentRealizationNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.ComponentRealization_4004, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CompositeStructureDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CompositeStructureDiagramEditPart.java
index c87df6bc8e5..447e98930ff 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CompositeStructureDiagramEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/CompositeStructureDiagramEditPart.java
@@ -1,56 +1,59 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CompositeStructureDiagramItemSemanticEditPolicy;
-
-/**
- * @generated
- */
-public class CompositeStructureDiagramEditPart extends PapyrusDiagramEditPart
-{
-	/**
-	 * @generated
-	 */
-	public final static String MODEL_ID = "CompositeStructure"; //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 1000;
-
-	/**
-	 * @generated
-	 */
-	public CompositeStructureDiagramEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CompositeStructureDiagramItemSemanticEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.CompositeStructureDiagramItemSemanticEditPolicy;

+

+/**

+ * @generated

+ */

+public class CompositeStructureDiagramEditPart extends PapyrusDiagramEditPart {

+

+	/**

+	 * @generated

+	 */

+	public final static String MODEL_ID = "CompositeStructure"; //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 1000;

+

+	/**

+	 * @generated

+	 */

+	public CompositeStructureDiagramEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CompositeStructureDiagramItemSemanticEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorAppliedStereotypeEditPart.java
index b5d5c4f8970..ff6ef9560ae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorAppliedStereotypeEditPart.java
@@ -1,759 +1,752 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6025;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ConnectorAppliedStereotypeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Connector_4013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorAppliedStereotypeEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		// The label is read-only (defined in GMFGen model)
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ConnectorAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6025;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ConnectorAppliedStereotypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Connector_4013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorAppliedStereotypeEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		// The label is read-only (defined in GMFGen model)

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorEditPart.java
index 9d35068fd3e..06dde246419 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorEditPart.java
@@ -1,135 +1,126 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ConnectorFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ConnectorItemSemanticEditPolicy;
-
-/**
- * @generated
- */
-public class ConnectorEditPart extends UMLConnectionNodeEditPart
-		implements ITreeBranchEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4013;
-
-	/**
-	 * @generated
-	 */
-	public ConnectorEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ConnectorItemSemanticEditPolicy());
-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ConnectorAppliedStereotypeEditPart) {
-			((ConnectorAppliedStereotypeEditPart) childEditPart).setLabel(
-					getPrimaryShape().getAppliedStereotypeLabel());
-			return true;
-		}
-		if (childEditPart instanceof ConnectorNameEditPart) {
-			((ConnectorNameEditPart) childEditPart).setLabel(
-					getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof ConnectorMultiplicitySourceEditPart) {
-			((ConnectorMultiplicitySourceEditPart) childEditPart).setLabel(
-					getPrimaryShape().getMultiplicitySourceLabel());
-			return true;
-		}
-		if (childEditPart instanceof ConnectorMultiplicityTargetEditPart) {
-			((ConnectorMultiplicityTargetEditPart) childEditPart).setLabel(
-					getPrimaryShape().getMultiplicityTargetLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ConnectorAppliedStereotypeEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof ConnectorNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof ConnectorMultiplicitySourceEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof ConnectorMultiplicityTargetEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected Connection createConnectionFigure() {
-		return new ConnectorFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	public ConnectorFigure getPrimaryShape() {
-		return (ConnectorFigure) getFigure();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

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

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ConnectorFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ConnectorItemSemanticEditPolicy;

+

+/**

+ * @generated

+ */

+public class ConnectorEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 4013;

+

+	/**

+	 * @generated

+	 */

+	public ConnectorEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ConnectorItemSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ConnectorAppliedStereotypeEditPart) {

+			((ConnectorAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+		}

+		if(childEditPart instanceof ConnectorNameEditPart) {

+			((ConnectorNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		}

+		if(childEditPart instanceof ConnectorMultiplicitySourceEditPart) {

+			((ConnectorMultiplicitySourceEditPart)childEditPart).setLabel(getPrimaryShape().getMultiplicitySourceLabel());

+		}

+		if(childEditPart instanceof ConnectorMultiplicityTargetEditPart) {

+			((ConnectorMultiplicityTargetEditPart)childEditPart).setLabel(getPrimaryShape().getMultiplicityTargetLabel());

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ConnectorAppliedStereotypeEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof ConnectorNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof ConnectorMultiplicitySourceEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof ConnectorMultiplicityTargetEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected Connection createConnectionFigure() {

+		return new ConnectorFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public ConnectorFigure getPrimaryShape() {

+		return (ConnectorFigure)getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicitySourceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicitySourceEditPart.java
index 8a9cc38d915..cb5545ba1c7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicitySourceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicitySourceEditPart.java
@@ -1,759 +1,752 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6051;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorMultiplicitySourceEditPart.VISUAL_ID), new Point(0, 20));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ConnectorMultiplicitySourceEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.SOURCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Connector_4013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorMultiplicitySourceEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		// The label is read-only (defined in GMFGen model)
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ConnectorMultiplicitySourceEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6051;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorMultiplicitySourceEditPart.VISUAL_ID), new Point(0, 20));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ConnectorMultiplicitySourceEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.SOURCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Connector_4013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorMultiplicitySourceEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		// The label is read-only (defined in GMFGen model)

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicityTargetEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicityTargetEditPart.java
index e29c80c4c29..fd616b90007 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicityTargetEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorMultiplicityTargetEditPart.java
@@ -1,759 +1,752 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6052;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorMultiplicityTargetEditPart.VISUAL_ID), new Point(0, 20));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ConnectorMultiplicityTargetEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.TARGET;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Connector_4013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorMultiplicityTargetEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		// The label is read-only (defined in GMFGen model)
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ConnectorMultiplicityTargetEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6052;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorMultiplicityTargetEditPart.VISUAL_ID), new Point(0, 20));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ConnectorMultiplicityTargetEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.TARGET;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Connector_4013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorMultiplicityTargetEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		// The label is read-only (defined in GMFGen model)

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorNameEditPart.java
index e93b306c86e..af6b894f964 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConnectorNameEditPart.java
@@ -1,783 +1,777 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ConnectorNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6050;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorNameEditPart.VISUAL_ID), new Point(0, -20));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ConnectorNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Connector_4013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ConnectorNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6050;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorNameEditPart.VISUAL_ID), new Point(0, -20));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ConnectorNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Connector_4013, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConnectorNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintConstrainedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintConstrainedElementEditPart.java
index ee47256b1bf..e404113d351 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintConstrainedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintConstrainedElementEditPart.java
@@ -1,66 +1,65 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;
-import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ConstraintConstrainedElementItemSemanticEditPolicy;
-
-/**
- * @generated
- */
-public class ConstraintConstrainedElementEditPart extends ConnectionEditPart
-		implements ITreeBranchEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4003;
-
-	/**
-	 * @generated
-	 */
-	public ConstraintConstrainedElementEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ConstraintConstrainedElementItemSemanticEditPolicy());
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected Connection createConnectionFigure() {
-		return new SimpleDashedEdgeFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	public SimpleDashedEdgeFigure getPrimaryShape() {
-		return (SimpleDashedEdgeFigure) getFigure();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ConstraintConstrainedElementItemSemanticEditPolicy;

+

+/**

+ * @generated

+ */

+public class ConstraintConstrainedElementEditPart extends ConnectionEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 4003;

+

+	/**

+	 * @generated

+	 */

+	public ConstraintConstrainedElementEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ConstraintConstrainedElementItemSemanticEditPolicy());

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected Connection createConnectionFigure() {

+		return new SimpleDashedEdgeFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public SimpleDashedEdgeFigure getPrimaryShape() {

+		return (SimpleDashedEdgeFigure)getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPart.java
index d4fb394a356..e903ab34f53 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPart.java
@@ -1,253 +1,264 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ConstraintItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class ConstraintEditPart extends AbstractConstraintEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2114;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ConstraintEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ConstraintItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new ConstraintFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure
-	 * @generated
-	 */
-	public ConstraintFigure getPrimaryShape() {
-		return (ConstraintFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ConstraintNameEditPart) {
-			((ConstraintNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof ConstraintSpecificationEditPart) {
-			((ConstraintSpecificationEditPart) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ConstraintNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof ConstraintSpecificationEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ConstraintNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ConstraintItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class ConstraintEditPart extends AbstractConstraintEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2114;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ConstraintEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ConstraintItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new ConstraintFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure

+	 * 

+	 * @generated

+	 */

+	public ConstraintFigure getPrimaryShape() {

+		return (ConstraintFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ConstraintNameEditPart) {

+			((ConstraintNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+		if(childEditPart instanceof ConstraintSpecificationEditPart) {

+			((ConstraintSpecificationEditPart)childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ConstraintNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof ConstraintSpecificationEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ConstraintNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPartCN.java
index 13e47ce8d87..7fe4c2682dd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintEditPartCN.java
@@ -1,253 +1,264 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ConstraintItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class ConstraintEditPartCN extends AbstractConstraintEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3120;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ConstraintEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ConstraintItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new ConstraintFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure
-	 * @generated
-	 */
-	public ConstraintFigure getPrimaryShape() {
-		return (ConstraintFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ConstraintNameEditPartCN) {
-			((ConstraintNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof ConstraintSpecificationEditPartCN) {
-			((ConstraintSpecificationEditPartCN) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ConstraintNameEditPartCN) {
-			return true;
-		}
-		if (childEditPart instanceof ConstraintSpecificationEditPartCN) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ConstraintNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ConstraintItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class ConstraintEditPartCN extends AbstractConstraintEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3120;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ConstraintEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ConstraintItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new ConstraintFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure

+	 * 

+	 * @generated

+	 */

+	public ConstraintFigure getPrimaryShape() {

+		return (ConstraintFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ConstraintNameEditPartCN) {

+			((ConstraintNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+		if(childEditPart instanceof ConstraintSpecificationEditPartCN) {

+			((ConstraintSpecificationEditPartCN)childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ConstraintNameEditPartCN) {

+			return true;

+		}

+		if(childEditPart instanceof ConstraintSpecificationEditPartCN) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ConstraintNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPart.java
index e1c48ac5ed1..49d8e4faa87 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5197;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ConstraintNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_2114, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ConstraintNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5197;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ConstraintNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_2114, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPartCN.java
index 54592401ae4..07fd67b2088 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintNameEditPartCN.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6048;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ConstraintNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_3120, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ConstraintNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6048;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ConstraintNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_3120, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPart.java
index 6864401e0f1..68344bd166d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPart.java
@@ -1,804 +1,801 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6039;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ConstraintSpecificationEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_2114, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintSpecificationEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ConstraintSpecificationEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6039;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ConstraintSpecificationEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_2114, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintSpecificationEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPartCN.java
index f5171ac6096..3be0e924013 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ConstraintSpecificationEditPartCN.java
@@ -1,804 +1,801 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6049;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ConstraintSpecificationEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_3120, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintSpecificationEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6049;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ConstraintSpecificationEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Constraint_3120, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintSpecificationEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPart.java
index a7f2d7a83cf..d0e7273f69c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPart.java
@@ -1,135 +1,129 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DataTypeAttributeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class DataTypeAttributeCompartmentEditPart
-		extends ListCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7033;
-
-	/**
-	 * @generated
-	 */
-	public DataTypeAttributeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.DataTypeAttributeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DataTypeAttributeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DataTypeAttributeCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class DataTypeAttributeCompartmentEditPart extends ListCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7033;

+

+	/**

+	 * @generated

+	 */

+	public DataTypeAttributeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean hasModelChildrenChanged(Notification evt) {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.DataTypeAttributeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DataTypeAttributeCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPartCN.java
index e60d5830db3..1419771c90b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeAttributeCompartmentEditPartCN.java
@@ -1,135 +1,129 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DataTypeAttributeCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class DataTypeAttributeCompartmentEditPartCN
-		extends ListCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7036;
-
-	/**
-	 * @generated
-	 */
-	public DataTypeAttributeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.DataTypeAttributeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DataTypeAttributeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DataTypeAttributeCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class DataTypeAttributeCompartmentEditPartCN extends ListCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7036;

+

+	/**

+	 * @generated

+	 */

+	public DataTypeAttributeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean hasModelChildrenChanged(Notification evt) {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.DataTypeAttributeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DataTypeAttributeCompartmentItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPart.java
index e2bc9c1e4a9..6574d734a6a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPart.java
@@ -1,303 +1,316 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DataTypeItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class DataTypeEditPart extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2068;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public DataTypeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DataTypeItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new DataTypeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure
-	 * @generated
-	 */
-	public DataTypeFigure getPrimaryShape() {
-		return (DataTypeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DataTypeNameEditPart) {
-			((DataTypeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof DataTypeAttributeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((DataTypeAttributeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof DataTypeOperationCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((DataTypeOperationCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DataTypeNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof DataTypeAttributeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();
-			pane.remove(((DataTypeAttributeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof DataTypeOperationCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
-			pane.remove(((DataTypeOperationCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof DataTypeAttributeCompartmentEditPart) {
-			return getPrimaryShape().getAttributeCompartmentFigure();
-		}
-		if (editPart instanceof DataTypeOperationCompartmentEditPart) {
-			return getPrimaryShape().getOperationCompartmentFigure();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeNameEditPart.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		if (request instanceof CreateViewAndElementRequest) {
-			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-			IElementType type = (IElementType) adapter.getAdapter(IElementType.class);
-			if (type == UMLElementTypes.Property_3101) {
-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPart.VISUAL_ID));
-			}
-			if (type == UMLElementTypes.Operation_3102) {
-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPart.VISUAL_ID));
-			}
-		}
-		return super.getTargetEditPart(request);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DataTypeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class DataTypeEditPart extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2068;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public DataTypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DataTypeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new DataTypeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure

+	 * 

+	 * @generated

+	 */

+	public DataTypeFigure getPrimaryShape() {

+		return (DataTypeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof DataTypeNameEditPart) {

+			((DataTypeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof DataTypeAttributeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((DataTypeAttributeCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+

+		if(childEditPart instanceof DataTypeOperationCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((DataTypeOperationCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof DataTypeNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof DataTypeAttributeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

+			pane.remove(((DataTypeAttributeCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof DataTypeOperationCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

+			pane.remove(((DataTypeOperationCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof DataTypeAttributeCompartmentEditPart) {

+			return getPrimaryShape().getAttributeCompartmentFigure();

+		}

+		if(editPart instanceof DataTypeOperationCompartmentEditPart) {

+			return getPrimaryShape().getOperationCompartmentFigure();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeNameEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		if(request instanceof CreateViewAndElementRequest) {

+			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();

+			IElementType type = (IElementType)adapter.getAdapter(IElementType.class);

+			if(type == UMLElementTypes.Property_3101) {

+				return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPart.VISUAL_ID));

+			}

+			if(type == UMLElementTypes.Operation_3102) {

+				return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPart.VISUAL_ID));

+			}

+		}

+		return super.getTargetEditPart(request);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPartCN.java
index ce1f4584cc8..9ca138b74de 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeEditPartCN.java
@@ -1,303 +1,316 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DataTypeItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class DataTypeEditPartCN extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3080;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public DataTypeEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DataTypeItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new DataTypeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure
-	 * @generated
-	 */
-	public DataTypeFigure getPrimaryShape() {
-		return (DataTypeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DataTypeNameEditPartCN) {
-			((DataTypeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof DataTypeAttributeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((DataTypeAttributeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof DataTypeOperationCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((DataTypeOperationCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DataTypeNameEditPartCN) {
-			return true;
-		}
-		if (childEditPart instanceof DataTypeAttributeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();
-			pane.remove(((DataTypeAttributeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof DataTypeOperationCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();
-			pane.remove(((DataTypeOperationCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof DataTypeAttributeCompartmentEditPartCN) {
-			return getPrimaryShape().getAttributeCompartmentFigure();
-		}
-		if (editPart instanceof DataTypeOperationCompartmentEditPartCN) {
-			return getPrimaryShape().getOperationCompartmentFigure();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeNameEditPartCN.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		if (request instanceof CreateViewAndElementRequest) {
-			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-			IElementType type = (IElementType) adapter.getAdapter(IElementType.class);
-			if (type == UMLElementTypes.Property_3101) {
-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPartCN.VISUAL_ID));
-			}
-			if (type == UMLElementTypes.Operation_3102) {
-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPartCN.VISUAL_ID));
-			}
-		}
-		return super.getTargetEditPart(request);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DataTypeItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class DataTypeEditPartCN extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3080;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public DataTypeEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DataTypeItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new DataTypeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.DataTypeFigure

+	 * 

+	 * @generated

+	 */

+	public DataTypeFigure getPrimaryShape() {

+		return (DataTypeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof DataTypeNameEditPartCN) {

+			((DataTypeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof DataTypeAttributeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((DataTypeAttributeCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+

+		if(childEditPart instanceof DataTypeOperationCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((DataTypeOperationCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof DataTypeNameEditPartCN) {

+			return true;

+		}

+		if(childEditPart instanceof DataTypeAttributeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getAttributeCompartmentFigure();

+			pane.remove(((DataTypeAttributeCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof DataTypeOperationCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getOperationCompartmentFigure();

+			pane.remove(((DataTypeOperationCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof DataTypeAttributeCompartmentEditPartCN) {

+			return getPrimaryShape().getAttributeCompartmentFigure();

+		}

+		if(editPart instanceof DataTypeOperationCompartmentEditPartCN) {

+			return getPrimaryShape().getOperationCompartmentFigure();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeNameEditPartCN.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		if(request instanceof CreateViewAndElementRequest) {

+			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();

+			IElementType type = (IElementType)adapter.getAdapter(IElementType.class);

+			if(type == UMLElementTypes.Property_3101) {

+				return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPartCN.VISUAL_ID));

+			}

+			if(type == UMLElementTypes.Operation_3102) {

+				return getChildBySemanticHint(UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPartCN.VISUAL_ID));

+			}

+		}

+		return super.getTargetEditPart(request);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPart.java
index c2b9451a949..43e03e254b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5120;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public DataTypeNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.DataType_2068, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DataTypeNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class DataTypeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5120;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public DataTypeNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.DataType_2068, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DataTypeNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPartCN.java
index 1415765fb23..cf6cb2f667b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeNameEditPartCN.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5136;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public DataTypeNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.DataType_3080, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DataTypeNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class DataTypeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5136;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public DataTypeNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.DataType_3080, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DataTypeNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPart.java
index 4816f6b86c3..a8e5c7ba56e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPart.java
@@ -1,135 +1,129 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DataTypeOperationCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class DataTypeOperationCompartmentEditPart
-		extends ListCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7034;
-
-	/**
-	 * @generated
-	 */
-	public DataTypeOperationCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.DataTypeOperationCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DataTypeOperationCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DataTypeOperationCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class DataTypeOperationCompartmentEditPart extends ListCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7034;

+

+	/**

+	 * @generated

+	 */

+	public DataTypeOperationCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean hasModelChildrenChanged(Notification evt) {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.DataTypeOperationCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DataTypeOperationCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPartCN.java
index 0a4f6d18731..085c03968a5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DataTypeOperationCompartmentEditPartCN.java
@@ -1,135 +1,129 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DataTypeOperationCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class DataTypeOperationCompartmentEditPartCN
-		extends ListCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7037;
-
-	/**
-	 * @generated
-	 */
-	public DataTypeOperationCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.DataTypeOperationCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DataTypeOperationCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DataTypeOperationCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class DataTypeOperationCompartmentEditPartCN extends ListCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7037;

+

+	/**

+	 * @generated

+	 */

+	public DataTypeOperationCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean hasModelChildrenChanged(Notification evt) {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.DataTypeOperationCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DataTypeOperationCompartmentItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyAppliedStereotypeEditPart.java
index 42e092a6b5b..1da88d4e709 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyAppliedStereotypeEditPart.java
@@ -1,759 +1,752 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6023;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));
-	}
-
-	/**
-	 * @generated
-	 */
-	public DependencyAppliedStereotypeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4010, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyAppliedStereotypeEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		// The label is read-only (defined in GMFGen model)
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class DependencyAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6023;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));

+	}

+

+	/**

+	 * @generated

+	 */

+	public DependencyAppliedStereotypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4010, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyAppliedStereotypeEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		// The label is read-only (defined in GMFGen model)

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyEditPart.java
index a029178201f..fd7ee97cbc7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyEditPart.java
@@ -1,119 +1,114 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DependencyItemSemanticEditPolicy;
-
-/**
- * @generated
- */
-public class DependencyEditPart extends UMLConnectionNodeEditPart
-		implements ITreeBranchEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4010;
-
-	/**
-	 * @generated
-	 */
-	public DependencyEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DependencyItemSemanticEditPolicy());
-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DependencyNameEditPart) {
-			((DependencyNameEditPart) childEditPart).setLabel(
-					getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof DependencyAppliedStereotypeEditPart) {
-			((DependencyAppliedStereotypeEditPart) childEditPart).setLabel(
-					getPrimaryShape().getAppliedStereotypeLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DependencyNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof DependencyAppliedStereotypeEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected Connection createConnectionFigure() {
-		return new DashedEdgeFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	public DashedEdgeFigure getPrimaryShape() {
-		return (DashedEdgeFigure) getFigure();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

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

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DependencyItemSemanticEditPolicy;

+

+/**

+ * @generated

+ */

+public class DependencyEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 4010;

+

+	/**

+	 * @generated

+	 */

+	public DependencyEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DependencyItemSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof DependencyNameEditPart) {

+			((DependencyNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		}

+		if(childEditPart instanceof DependencyAppliedStereotypeEditPart) {

+			((DependencyAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof DependencyNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof DependencyAppliedStereotypeEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected Connection createConnectionFigure() {

+		return new DashedEdgeFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public DashedEdgeFigure getPrimaryShape() {

+		return (DashedEdgeFigure)getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyNameEditPart.java
index 538f295c67e..2c1de4e624d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DependencyNameEditPart.java
@@ -1,766 +1,760 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6009;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyNameEditPart.VISUAL_ID), new Point(0, 60));
-	}
-
-	/**
-	 * @generated
-	 */
-	public DependencyNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4010, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class DependencyNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6009;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyNameEditPart.VISUAL_ID), new Point(0, 60));

+	}

+

+	/**

+	 * @generated

+	 */

+	public DependencyNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4010, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentAppliedStereotypeEditPart.java
index 2003e5309f2..837dbd5917f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentAppliedStereotypeEditPart.java
@@ -1,759 +1,752 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6022;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));
-	}
-
-	/**
-	 * @generated
-	 */
-	public DeploymentAppliedStereotypeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Deployment_4009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentAppliedStereotypeEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		// The label is read-only (defined in GMFGen model)
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class DeploymentAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6022;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));

+	}

+

+	/**

+	 * @generated

+	 */

+	public DeploymentAppliedStereotypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Deployment_4009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentAppliedStereotypeEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		// The label is read-only (defined in GMFGen model)

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentEditPart.java
index b5b4c40a471..2c371603eeb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentEditPart.java
@@ -1,120 +1,115 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeDeploymentLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DeploymentItemSemanticEditPolicy;
-
-/**
- * @generated
- */
-public class DeploymentEditPart extends UMLConnectionNodeEditPart
-		implements ITreeBranchEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4009;
-
-	/**
-	 * @generated
-	 */
-	public DeploymentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DeploymentItemSemanticEditPolicy());
-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeDeploymentLabelDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DeploymentNameEditPart) {
-			((DeploymentNameEditPart) childEditPart).setLabel(
-					getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof DeploymentAppliedStereotypeEditPart) {
-			((DeploymentAppliedStereotypeEditPart) childEditPart).setLabel(
-					getPrimaryShape().getAppliedStereotypeLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DeploymentNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof DeploymentAppliedStereotypeEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected Connection createConnectionFigure() {
-		return new DashedEdgeFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	public DashedEdgeFigure getPrimaryShape() {
-		return (DashedEdgeFigure) getFigure();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

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

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeDeploymentLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DeploymentItemSemanticEditPolicy;

+

+/**

+ * @generated

+ */

+public class DeploymentEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 4009;

+

+	/**

+	 * @generated

+	 */

+	public DeploymentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DeploymentItemSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeDeploymentLabelDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof DeploymentNameEditPart) {

+			((DeploymentNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		}

+		if(childEditPart instanceof DeploymentAppliedStereotypeEditPart) {

+			((DeploymentAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof DeploymentNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof DeploymentAppliedStereotypeEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected Connection createConnectionFigure() {

+		return new DashedEdgeFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public DashedEdgeFigure getPrimaryShape() {

+		return (DashedEdgeFigure)getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentNameEditPart.java
index 0f02c18cf88..962ca1bc07c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentNameEditPart.java
@@ -1,766 +1,760 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6008;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentNameEditPart.VISUAL_ID), new Point(0, 60));
-	}
-
-	/**
-	 * @generated
-	 */
-	public DeploymentNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Deployment_4009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class DeploymentNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6008;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentNameEditPart.VISUAL_ID), new Point(0, 60));

+	}

+

+	/**

+	 * @generated

+	 */

+	public DeploymentNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Deployment_4009, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPart.java
index 2b027416569..b7d1599f911 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPart.java
@@ -1,239 +1,248 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DeploymentSpecificationItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class DeploymentSpecificationEditPart extends NodeEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2078;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public DeploymentSpecificationEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DeploymentSpecificationItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeNamedElementFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 * @generated
-	 */
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DeploymentSpecificationNameEditPart) {
-			((DeploymentSpecificationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DeploymentSpecificationNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DeploymentSpecificationNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DeploymentSpecificationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class DeploymentSpecificationEditPart extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2078;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public DeploymentSpecificationEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DeploymentSpecificationItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeNamedElementFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 * 

+	 * @generated

+	 */

+	public NodeNamedElementFigure getPrimaryShape() {

+		return (NodeNamedElementFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof DeploymentSpecificationNameEditPart) {

+			((DeploymentSpecificationNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof DeploymentSpecificationNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DeploymentSpecificationNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPartCN.java
index 98aee7de9b9..12237c137ef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationEditPartCN.java
@@ -1,239 +1,248 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DeploymentSpecificationItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class DeploymentSpecificationEditPartCN extends NodeEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3092;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public DeploymentSpecificationEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DeploymentSpecificationItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeNamedElementFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 * @generated
-	 */
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DeploymentSpecificationNameEditPartCN) {
-			((DeploymentSpecificationNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DeploymentSpecificationNameEditPartCN) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DeploymentSpecificationNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DeploymentSpecificationItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class DeploymentSpecificationEditPartCN extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3092;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public DeploymentSpecificationEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DeploymentSpecificationItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeNamedElementFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 * 

+	 * @generated

+	 */

+	public NodeNamedElementFigure getPrimaryShape() {

+		return (NodeNamedElementFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof DeploymentSpecificationNameEditPartCN) {

+			((DeploymentSpecificationNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof DeploymentSpecificationNameEditPartCN) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DeploymentSpecificationNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPart.java
index 3b848a15102..5a7c15a2a7d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5161;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public DeploymentSpecificationNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.DeploymentSpecification_2078, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentSpecificationNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class DeploymentSpecificationNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5161;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public DeploymentSpecificationNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.DeploymentSpecification_2078, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentSpecificationNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPartCN.java
index 2174af365fc..73c2a78661e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeploymentSpecificationNameEditPartCN.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5145;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public DeploymentSpecificationNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.DeploymentSpecification_3092, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentSpecificationNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class DeploymentSpecificationNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5145;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public DeploymentSpecificationNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.DeploymentSpecification_3092, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentSpecificationNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPart.java
index 73feeeb466a..63e996feceb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPart.java
@@ -1,132 +1,126 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DeviceCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class DeviceCompositeCompartmentEditPart
-		extends ShapeCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7070;
-
-	/**
-	 * @generated
-	 */
-	public DeviceCompositeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.DeviceCompositeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DeviceCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DeviceCompositeCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class DeviceCompositeCompartmentEditPart extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7070;

+

+	/**

+	 * @generated

+	 */

+	public DeviceCompositeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.DeviceCompositeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DeviceCompositeCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPartCN.java
index 981484826cf..e6225366e20 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeCompartmentEditPartCN.java
@@ -1,132 +1,126 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DeviceCompositeCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class DeviceCompositeCompartmentEditPartCN
-		extends ShapeCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7057;
-
-	/**
-	 * @generated
-	 */
-	public DeviceCompositeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.DeviceCompositeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DeviceCompositeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DeviceCompositeCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class DeviceCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7057;

+

+	/**

+	 * @generated

+	 */

+	public DeviceCompositeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.DeviceCompositeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DeviceCompositeCompartmentItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPart.java
index 67a52a5eb3d..afe4e287efa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPart.java
@@ -1,301 +1,317 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.DeviceCompositeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DeviceCompositeItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class DeviceCompositeEditPart extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2070;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public DeviceCompositeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DeviceCompositeItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				switch (UMLVisualIDRegistry.getVisualID(childView)) {
-				case PortEditPart.VISUAL_ID:
-					return new BorderItemResizableEditPolicy();
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new DeviceCompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.DeviceCompositeFigure
-	 * @generated
-	 */
-	public DeviceCompositeFigure getPrimaryShape() {
-		return (DeviceCompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DeviceCompositeNameEditPart) {
-			((DeviceCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof DeviceCompositeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((DeviceCompositeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DeviceCompositeNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof DeviceCompositeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((DeviceCompositeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof DeviceCompositeCompartmentEditPart) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createMainFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DeviceCompositeNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.DeviceCompositeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DeviceCompositeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class DeviceCompositeEditPart extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2070;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public DeviceCompositeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DeviceCompositeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case PortEditPart.VISUAL_ID:

+					return new BorderItemResizableEditPolicy();

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new DeviceCompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.DeviceCompositeFigure

+	 * 

+	 * @generated

+	 */

+	public DeviceCompositeFigure getPrimaryShape() {

+		return (DeviceCompositeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof DeviceCompositeNameEditPart) {

+			((DeviceCompositeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof DeviceCompositeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((DeviceCompositeCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof DeviceCompositeNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof DeviceCompositeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((DeviceCompositeCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof DeviceCompositeCompartmentEditPart) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		if(editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DeviceCompositeNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPartCN.java
index 1b20bc3726a..5295c768a7c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeEditPartCN.java
@@ -1,301 +1,317 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.DeviceCompositeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DeviceCompositeItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class DeviceCompositeEditPartCN extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3082;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public DeviceCompositeEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DeviceCompositeItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				switch (UMLVisualIDRegistry.getVisualID(childView)) {
-				case PortEditPart.VISUAL_ID:
-					return new BorderItemResizableEditPolicy();
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new DeviceCompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.DeviceCompositeFigure
-	 * @generated
-	 */
-	public DeviceCompositeFigure getPrimaryShape() {
-		return (DeviceCompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DeviceCompositeNameEditPartCN) {
-			((DeviceCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof DeviceCompositeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((DeviceCompositeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DeviceCompositeNameEditPartCN) {
-			return true;
-		}
-		if (childEditPart instanceof DeviceCompositeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((DeviceCompositeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof DeviceCompositeCompartmentEditPartCN) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createMainFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DeviceCompositeNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.DeviceCompositeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DeviceCompositeItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class DeviceCompositeEditPartCN extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3082;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public DeviceCompositeEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DeviceCompositeItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case PortEditPart.VISUAL_ID:

+					return new BorderItemResizableEditPolicy();

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new DeviceCompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.DeviceCompositeFigure

+	 * 

+	 * @generated

+	 */

+	public DeviceCompositeFigure getPrimaryShape() {

+		return (DeviceCompositeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof DeviceCompositeNameEditPartCN) {

+			((DeviceCompositeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof DeviceCompositeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((DeviceCompositeCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof DeviceCompositeNameEditPartCN) {

+			return true;

+		}

+		if(childEditPart instanceof DeviceCompositeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((DeviceCompositeCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof DeviceCompositeCompartmentEditPartCN) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		if(editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DeviceCompositeNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPart.java
index a8b41d008ec..1d3c4db4fbf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5122;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public DeviceCompositeNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Device_2070, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeviceCompositeNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class DeviceCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5122;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public DeviceCompositeNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Device_2070, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeviceCompositeNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPartCN.java
index a2cceb12efd..b8560c664ff 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DeviceCompositeNameEditPartCN.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5138;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public DeviceCompositeNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Device_3082, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeviceCompositeNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class DeviceCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5138;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public DeviceCompositeNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Device_3082, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeviceCompositeNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPart.java
index 2f750d8855d..cbafa80d578 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPart.java
@@ -1,253 +1,264 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DurationConstraintItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class DurationConstraintEditPart extends AbstractConstraintEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2110;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public DurationConstraintEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DurationConstraintItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new ConstraintFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure
-	 * @generated
-	 */
-	public ConstraintFigure getPrimaryShape() {
-		return (ConstraintFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DurationConstraintNameEditPart) {
-			((DurationConstraintNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof DurationConstraintSpecificationEditPart) {
-			((DurationConstraintSpecificationEditPart) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DurationConstraintNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof DurationConstraintSpecificationEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DurationConstraintNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DurationConstraintItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class DurationConstraintEditPart extends AbstractConstraintEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2110;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public DurationConstraintEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DurationConstraintItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new ConstraintFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure

+	 * 

+	 * @generated

+	 */

+	public ConstraintFigure getPrimaryShape() {

+		return (ConstraintFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof DurationConstraintNameEditPart) {

+			((DurationConstraintNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+		if(childEditPart instanceof DurationConstraintSpecificationEditPart) {

+			((DurationConstraintSpecificationEditPart)childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof DurationConstraintNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof DurationConstraintSpecificationEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DurationConstraintNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPartCN.java
index 8c3976fe474..781b264fcab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintEditPartCN.java
@@ -1,253 +1,264 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DurationConstraintItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class DurationConstraintEditPartCN extends AbstractConstraintEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3116;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public DurationConstraintEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DurationConstraintItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new ConstraintFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure
-	 * @generated
-	 */
-	public ConstraintFigure getPrimaryShape() {
-		return (ConstraintFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DurationConstraintNameEditPartCN) {
-			((DurationConstraintNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof DurationConstraintSpecificationEditPartCN) {
-			((DurationConstraintSpecificationEditPartCN) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DurationConstraintNameEditPartCN) {
-			return true;
-		}
-		if (childEditPart instanceof DurationConstraintSpecificationEditPartCN) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DurationConstraintNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DurationConstraintItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class DurationConstraintEditPartCN extends AbstractConstraintEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3116;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public DurationConstraintEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DurationConstraintItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new ConstraintFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure

+	 * 

+	 * @generated

+	 */

+	public ConstraintFigure getPrimaryShape() {

+		return (ConstraintFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof DurationConstraintNameEditPartCN) {

+			((DurationConstraintNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+		if(childEditPart instanceof DurationConstraintSpecificationEditPartCN) {

+			((DurationConstraintSpecificationEditPartCN)childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof DurationConstraintNameEditPartCN) {

+			return true;

+		}

+		if(childEditPart instanceof DurationConstraintSpecificationEditPartCN) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DurationConstraintNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPart.java
index 60ef6df0ea4..2e340ec0bc6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5193;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public DurationConstraintNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.DurationConstraint_2110, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationConstraintNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class DurationConstraintNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5193;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public DurationConstraintNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.DurationConstraint_2110, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationConstraintNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPartCN.java
index 4990afadf77..212b1b9adea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintNameEditPartCN.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6040;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public DurationConstraintNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.DurationConstraint_3116, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationConstraintNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class DurationConstraintNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6040;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public DurationConstraintNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.DurationConstraint_3116, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationConstraintNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPart.java
index 03705247112..01b56a720c3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPart.java
@@ -1,804 +1,801 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6035;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public DurationConstraintSpecificationEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.DurationConstraint_2110, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationConstraintSpecificationEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class DurationConstraintSpecificationEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6035;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public DurationConstraintSpecificationEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.DurationConstraint_2110, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationConstraintSpecificationEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPartCN.java
index a8050462898..cd79be55525 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationConstraintSpecificationEditPartCN.java
@@ -1,804 +1,801 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6041;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public DurationConstraintSpecificationEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.DurationConstraint_3116, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationConstraintSpecificationEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class DurationConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6041;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public DurationConstraintSpecificationEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.DurationConstraint_3116, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationConstraintSpecificationEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationEditPart.java
index 91b5546ce2c..4f7417dac8e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationEditPart.java
@@ -1,239 +1,248 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DurationItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class DurationEditPart extends NodeEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2104;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public DurationEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DurationItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeNamedElementFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 * @generated
-	 */
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DurationNameEditPart) {
-			((DurationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DurationNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DurationNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DurationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class DurationEditPart extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2104;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public DurationEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DurationItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeNamedElementFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 * 

+	 * @generated

+	 */

+	public NodeNamedElementFigure getPrimaryShape() {

+		return (NodeNamedElementFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof DurationNameEditPart) {

+			((DurationNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof DurationNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DurationNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalEditPart.java
index aa6df210f6c..4c0b2c7b825 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalEditPart.java
@@ -1,239 +1,248 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DurationIntervalItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class DurationIntervalEditPart extends NodeEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2106;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public DurationIntervalEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DurationIntervalItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeNamedElementFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 * @generated
-	 */
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DurationIntervalNameEditPart) {
-			((DurationIntervalNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof DurationIntervalNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DurationIntervalNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DurationIntervalItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class DurationIntervalEditPart extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2106;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public DurationIntervalEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DurationIntervalItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeNamedElementFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 * 

+	 * @generated

+	 */

+	public NodeNamedElementFigure getPrimaryShape() {

+		return (NodeNamedElementFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof DurationIntervalNameEditPart) {

+			((DurationIntervalNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof DurationIntervalNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DurationIntervalNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalNameEditPart.java
index fabdadb1e5d..7f9ec73e32c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationIntervalNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5189;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public DurationIntervalNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.DurationInterval_2106, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationIntervalNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class DurationIntervalNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5189;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public DurationIntervalNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.DurationInterval_2106, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationIntervalNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationNameEditPart.java
index 7092f6dab2d..83dbee7e064 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class DurationNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5187;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public DurationNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Duration_2104, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class DurationNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5187;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public DurationNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Duration_2104, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEditPart.java
index 9a9acfdef92..aeb98c3e856 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEditPart.java
@@ -1,252 +1,260 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.handles.MoveHandle;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.parts.AbstractObservationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.ObservationLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.DurationObservationNodeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DurationObservationItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class DurationObservationEditPart extends AbstractObservationEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2093;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public DurationObservationEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DurationObservationItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeIconlDisplayEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new ObservationLayoutEditPolicy());
-		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				switch (UMLVisualIDRegistry.getVisualID(childView)) {
-				case DurationObservationNameEditPart.VISUAL_ID:
-				case DurationObservationStereotypeLabelEditPart.VISUAL_ID:
-					return new BorderItemSelectionEditPolicy() {
-						protected List<?> createSelectionHandles() {
-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());
-							mh.setBorder(null);
-							return Collections.singletonList(mh);
-						}
-					}
-					;
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		/*
-		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart
-		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!
-		 */
-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {
-			Object notifier = event.getNotifier();
-			List<?> modelChildren = ((View) getModel()).getChildren();
-			if (!(notifier instanceof Edge)) {
-				if (modelChildren.contains(event.getNotifier())) {
-					return;
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new DurationObservationNodeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.DurationObservationNodeFigure
-	 * @generated
-	 */
-	public DurationObservationNodeFigure getPrimaryShape() {
-		return (DurationObservationNodeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {
-		if (borderItemEditPart instanceof DurationObservationNameEditPart) {
-			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());
-			borderItemContainer.add(borderItemEditPart.getFigure(), locator);
-		} else if (borderItemEditPart instanceof DurationObservationStereotypeLabelEditPart) {
-			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());
-			borderItemContainer.add(borderItemEditPart.getFigure(), locator);
-		} else
-		{
-			super.addBorderItem(borderItemContainer, borderItemEditPart);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createMainFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DurationObservationNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.parts.AbstractObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.ObservationLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.DurationObservationNodeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DurationObservationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class DurationObservationEditPart extends AbstractObservationEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2093;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public DurationObservationEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DurationObservationItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeIconlDisplayEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new ObservationLayoutEditPolicy());

+		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case DurationObservationNameEditPart.VISUAL_ID:

+				case DurationObservationStereotypeLabelEditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy() {

+

+						protected List<?> createSelectionHandles() {

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

+							mh.setBorder(null);

+							return Collections.singletonList(mh);

+						}

+					};

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		/*

+		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

+		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

+		 */

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+			Object notifier = event.getNotifier();

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

+					return;

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new DurationObservationNodeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.DurationObservationNodeFigure

+	 * 

+	 * @generated

+	 */

+	public DurationObservationNodeFigure getPrimaryShape() {

+		return (DurationObservationNodeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

+		if(borderItemEditPart instanceof DurationObservationNameEditPart) {

+			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else if(borderItemEditPart instanceof DurationObservationStereotypeLabelEditPart) {

+			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(DurationObservationNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEventEditPart.java
index abd7f2fddab..6df9a652da6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationEventEditPart.java
@@ -1,66 +1,65 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;
-import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DurationObservationEventItemSemanticEditPolicy;
-
-/**
- * @generated
- */
-public class DurationObservationEventEditPart extends ConnectionEditPart
-		implements ITreeBranchEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4019;
-
-	/**
-	 * @generated
-	 */
-	public DurationObservationEventEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DurationObservationEventItemSemanticEditPolicy());
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected Connection createConnectionFigure() {
-		return new SimpleDashedEdgeFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	public SimpleDashedEdgeFigure getPrimaryShape() {
-		return (SimpleDashedEdgeFigure) getFigure();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.DurationObservationEventItemSemanticEditPolicy;

+

+/**

+ * @generated

+ */

+public class DurationObservationEventEditPart extends ConnectionEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 4019;

+

+	/**

+	 * @generated

+	 */

+	public DurationObservationEventEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new DurationObservationEventItemSemanticEditPolicy());

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected Connection createConnectionFigure() {

+		return new SimpleDashedEdgeFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public SimpleDashedEdgeFigure getPrimaryShape() {

+		return (SimpleDashedEdgeFigure)getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationNameEditPart.java
index f251f7064e3..2207e5eaa37 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationNameEditPart.java
@@ -1,791 +1,783 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class DurationObservationNameEditPart extends LabelEditPart
-		implements ITextAwareEditPart, IBorderItemEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5151;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationNameEditPart.VISUAL_ID), new Point(0, 0));
-	}
-
-	/**
-	 * @generated
-	 */
-	public DurationObservationNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public IBorderItemLocator getBorderItemLocator() {
-		IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator) constraint;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void refreshBounds() {
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.DurationObservation_2093, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new WrappingLabel();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class DurationObservationNameEditPart extends LabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5151;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationNameEditPart.VISUAL_ID), new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public DurationObservationNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

+			return (IBorderItemLocator)constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.DurationObservation_2093, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new WrappingLabel();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationStereotypeLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationStereotypeLabelEditPart.java
index 97b8eea14e2..1d69dcd0327 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationStereotypeLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/DurationObservationStereotypeLabelEditPart.java
@@ -1,796 +1,787 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class DurationObservationStereotypeLabelEditPart extends
-		AbstractLabelEditPart
-		implements ITextAwareEditPart, IBorderItemEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5152;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationStereotypeLabelEditPart.VISUAL_ID), new Point(0, 0));
-	}
-
-	/**
-	 * @generated
-	 */
-	public DurationObservationStereotypeLabelEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeExternalNodeEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public IBorderItemLocator getBorderItemLocator() {
-		IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator) constraint;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void refreshBounds() {
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.DurationObservation_2093, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationStereotypeLabelEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new AppliedStereotypeWrappingLabelFigure();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class DurationObservationStereotypeLabelEditPart extends AbstractLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5152;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationStereotypeLabelEditPart.VISUAL_ID), new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public DurationObservationStereotypeLabelEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeExternalNodeEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

+			return (IBorderItemLocator)constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.DurationObservation_2093, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationStereotypeLabelEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new AppliedStereotypeWrappingLabelFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPart.java
index 6bf3a577d6f..f4c2396131b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPart.java
@@ -1,288 +1,300 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.EnumerationItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class EnumerationEditPart extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2067;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public EnumerationEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new EnumerationItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new EnumerationFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure
-	 * @generated
-	 */
-	public EnumerationFigure getPrimaryShape() {
-		return (EnumerationFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof EnumerationNameEditPart) {
-			((EnumerationNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((EnumerationEnumerationLiteralCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof EnumerationNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure();
-			pane.remove(((EnumerationEnumerationLiteralCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof EnumerationEnumerationLiteralCompartmentEditPart) {
-			return getPrimaryShape().getEnumerationLiteralCompartmentFigure();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationNameEditPart.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		if (request instanceof CreateViewAndElementRequest) {
-			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-			IElementType type = (IElementType) adapter.getAdapter(IElementType.class);
-			if (type == UMLElementTypes.EnumerationLiteral_3066) {
-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID));
-			}
-		}
-		return super.getTargetEditPart(request);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.EnumerationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class EnumerationEditPart extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2067;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public EnumerationEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new EnumerationItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new EnumerationFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure

+	 * 

+	 * @generated

+	 */

+	public EnumerationFigure getPrimaryShape() {

+		return (EnumerationFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof EnumerationNameEditPart) {

+			((EnumerationNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((EnumerationEnumerationLiteralCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof EnumerationNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure();

+			pane.remove(((EnumerationEnumerationLiteralCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof EnumerationEnumerationLiteralCompartmentEditPart) {

+			return getPrimaryShape().getEnumerationLiteralCompartmentFigure();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationNameEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		if(request instanceof CreateViewAndElementRequest) {

+			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();

+			IElementType type = (IElementType)adapter.getAdapter(IElementType.class);

+			if(type == UMLElementTypes.EnumerationLiteral_3066) {

+				return getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID));

+			}

+		}

+		return super.getTargetEditPart(request);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPartCN.java
index 0754acc17ff..86a8094a453 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEditPartCN.java
@@ -1,288 +1,300 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.EnumerationItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class EnumerationEditPartCN extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3079;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public EnumerationEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new EnumerationItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new EnumerationFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure
-	 * @generated
-	 */
-	public EnumerationFigure getPrimaryShape() {
-		return (EnumerationFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof EnumerationNameEditPartCN) {
-			((EnumerationNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((EnumerationEnumerationLiteralCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof EnumerationNameEditPartCN) {
-			return true;
-		}
-		if (childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure();
-			pane.remove(((EnumerationEnumerationLiteralCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof EnumerationEnumerationLiteralCompartmentEditPartCN) {
-			return getPrimaryShape().getEnumerationLiteralCompartmentFigure();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationNameEditPartCN.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		if (request instanceof CreateViewAndElementRequest) {
-			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-			IElementType type = (IElementType) adapter.getAdapter(IElementType.class);
-			if (type == UMLElementTypes.EnumerationLiteral_3066) {
-				return getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID));
-			}
-		}
-		return super.getTargetEditPart(request);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.EnumerationItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class EnumerationEditPartCN extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3079;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public EnumerationEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new EnumerationItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new EnumerationFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.EnumerationFigure

+	 * 

+	 * @generated

+	 */

+	public EnumerationFigure getPrimaryShape() {

+		return (EnumerationFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof EnumerationNameEditPartCN) {

+			((EnumerationNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((EnumerationEnumerationLiteralCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof EnumerationNameEditPartCN) {

+			return true;

+		}

+		if(childEditPart instanceof EnumerationEnumerationLiteralCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getEnumerationLiteralCompartmentFigure();

+			pane.remove(((EnumerationEnumerationLiteralCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof EnumerationEnumerationLiteralCompartmentEditPartCN) {

+			return getPrimaryShape().getEnumerationLiteralCompartmentFigure();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationNameEditPartCN.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+		if(request instanceof CreateViewAndElementRequest) {

+			CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest)request).getViewAndElementDescriptor().getCreateElementRequestAdapter();

+			IElementType type = (IElementType)adapter.getAdapter(IElementType.class);

+			if(type == UMLElementTypes.EnumerationLiteral_3066) {

+				return getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID));

+			}

+		}

+		return super.getTargetEditPart(request);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java
index 6f5a760f99f..cc1b824b6bd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPart.java
@@ -1,135 +1,129 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class EnumerationEnumerationLiteralCompartmentEditPart
-		extends ListCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7048;
-
-	/**
-	 * @generated
-	 */
-	public EnumerationEnumerationLiteralCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.EnumerationEnumerationLiteralCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class EnumerationEnumerationLiteralCompartmentEditPart extends ListCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7048;

+

+	/**

+	 * @generated

+	 */

+	public EnumerationEnumerationLiteralCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean hasModelChildrenChanged(Notification evt) {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.EnumerationEnumerationLiteralCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java
index 4b2c85c1358..a6a757f1fc4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationEnumerationLiteralCompartmentEditPartCN.java
@@ -1,135 +1,129 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class EnumerationEnumerationLiteralCompartmentEditPartCN
-		extends ListCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7049;
-
-	/**
-	 * @generated
-	 */
-	public EnumerationEnumerationLiteralCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean hasModelChildrenChanged(Notification evt) {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.EnumerationEnumerationLiteralCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class EnumerationEnumerationLiteralCompartmentEditPartCN extends ListCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7049;

+

+	/**

+	 * @generated

+	 */

+	public EnumerationEnumerationLiteralCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean hasModelChildrenChanged(Notification evt) {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.EnumerationEnumerationLiteralCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationLiteralEditPartCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationLiteralEditPartCLN.java
index 93a8e3378a6..e352416db96 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationLiteralEditPartCLN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationLiteralEditPartCLN.java
@@ -1,824 +1,817 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.requests.SelectionRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ListItemComponentEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.EnumerationLiteralItemSemanticEditPolicyCLN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextNonResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class EnumerationLiteralEditPartCLN extends CompartmentEditPart
-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3066;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public EnumerationLiteralEditPartCLN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public DragTracker getDragTracker(Request request) {
-		if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) {
-			return null;
-		}
-		return new DragEditPartsTrackerEx(this);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new EnumerationLiteralItemSemanticEditPolicyCLN());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());
-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.EnumerationLiteral_3066, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.EnumerationLiteralEditPartCLN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) {
-			refreshUnderline();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new WrappingLabel();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public boolean isSelectable() {
-		return getFigure().isShowing();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.DragTracker;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.requests.SelectionRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ListItemComponentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.EnumerationLiteralItemSemanticEditPolicyCLN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class EnumerationLiteralEditPartCLN extends CompartmentEditPart implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3066;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public EnumerationLiteralEditPartCLN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public DragTracker getDragTracker(Request request) {

+		if(request instanceof SelectionRequest && ((SelectionRequest)request).getLastButtonPressed() == 3) {

+			return null;

+		}

+		return new DragEditPartsTrackerEx(this);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new EnumerationLiteralItemSemanticEditPolicyCLN());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

+		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.EnumerationLiteral_3066, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.EnumerationLiteralEditPartCLN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		if(UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) {

+			refreshUnderline();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new WrappingLabel();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public boolean isSelectable() {

+		return getFigure().isShowing();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPart.java
index 061f0f870c8..16bae274b4b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5119;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public EnumerationNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Enumeration_2067, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.EnumerationNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class EnumerationNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5119;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public EnumerationNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Enumeration_2067, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.EnumerationNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPartCN.java
index 69b6ea60910..25612e09372 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/EnumerationNameEditPartCN.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5135;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public EnumerationNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Enumeration_3079, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.EnumerationNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class EnumerationNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5135;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public EnumerationNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Enumeration_3079, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.EnumerationNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPart.java
index 20ddac5b742..5f1ea3fe4aa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPart.java
@@ -1,132 +1,126 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class ExecutionEnvironmentCompositeCompartmentEditPart
-		extends ShapeCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7071;
-
-	/**
-	 * @generated
-	 */
-	public ExecutionEnvironmentCompositeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.ExecutionEnvironmentCompositeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class ExecutionEnvironmentCompositeCompartmentEditPart extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7071;

+

+	/**

+	 * @generated

+	 */

+	public ExecutionEnvironmentCompositeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ExecutionEnvironmentCompositeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPartCN.java
index fb66542379d..17305427167 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeCompartmentEditPartCN.java
@@ -1,132 +1,126 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class ExecutionEnvironmentCompositeCompartmentEditPartCN
-		extends ShapeCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7058;
-
-	/**
-	 * @generated
-	 */
-	public ExecutionEnvironmentCompositeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.ExecutionEnvironmentCompositeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class ExecutionEnvironmentCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7058;

+

+	/**

+	 * @generated

+	 */

+	public ExecutionEnvironmentCompositeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ExecutionEnvironmentCompositeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPart.java
index a39f64febdd..22e31131319 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPart.java
@@ -1,301 +1,317 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ExecutionEnvironmentCompositeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ExecutionEnvironmentCompositeItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class ExecutionEnvironmentCompositeEditPart extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2071;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ExecutionEnvironmentCompositeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ExecutionEnvironmentCompositeItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				switch (UMLVisualIDRegistry.getVisualID(childView)) {
-				case PortEditPart.VISUAL_ID:
-					return new BorderItemResizableEditPolicy();
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new ExecutionEnvironmentCompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ExecutionEnvironmentCompositeFigure
-	 * @generated
-	 */
-	public ExecutionEnvironmentCompositeFigure getPrimaryShape() {
-		return (ExecutionEnvironmentCompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ExecutionEnvironmentCompositeNameEditPart) {
-			((ExecutionEnvironmentCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof ExecutionEnvironmentCompositeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((ExecutionEnvironmentCompositeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ExecutionEnvironmentCompositeNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof ExecutionEnvironmentCompositeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((ExecutionEnvironmentCompositeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof ExecutionEnvironmentCompositeCompartmentEditPart) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createMainFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ExecutionEnvironmentCompositeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ExecutionEnvironmentCompositeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class ExecutionEnvironmentCompositeEditPart extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2071;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ExecutionEnvironmentCompositeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ExecutionEnvironmentCompositeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case PortEditPart.VISUAL_ID:

+					return new BorderItemResizableEditPolicy();

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new ExecutionEnvironmentCompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ExecutionEnvironmentCompositeFigure

+	 * 

+	 * @generated

+	 */

+	public ExecutionEnvironmentCompositeFigure getPrimaryShape() {

+		return (ExecutionEnvironmentCompositeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ExecutionEnvironmentCompositeNameEditPart) {

+			((ExecutionEnvironmentCompositeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof ExecutionEnvironmentCompositeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ExecutionEnvironmentCompositeCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ExecutionEnvironmentCompositeNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof ExecutionEnvironmentCompositeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((ExecutionEnvironmentCompositeCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof ExecutionEnvironmentCompositeCompartmentEditPart) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		if(editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPartCN.java
index 8bcc4b7f7fe..715d92d22f6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeEditPartCN.java
@@ -1,301 +1,317 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ExecutionEnvironmentCompositeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ExecutionEnvironmentCompositeItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class ExecutionEnvironmentCompositeEditPartCN extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3083;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ExecutionEnvironmentCompositeEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ExecutionEnvironmentCompositeItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				switch (UMLVisualIDRegistry.getVisualID(childView)) {
-				case PortEditPart.VISUAL_ID:
-					return new BorderItemResizableEditPolicy();
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new ExecutionEnvironmentCompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ExecutionEnvironmentCompositeFigure
-	 * @generated
-	 */
-	public ExecutionEnvironmentCompositeFigure getPrimaryShape() {
-		return (ExecutionEnvironmentCompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ExecutionEnvironmentCompositeNameEditPartCN) {
-			((ExecutionEnvironmentCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof ExecutionEnvironmentCompositeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((ExecutionEnvironmentCompositeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ExecutionEnvironmentCompositeNameEditPartCN) {
-			return true;
-		}
-		if (childEditPart instanceof ExecutionEnvironmentCompositeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((ExecutionEnvironmentCompositeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof ExecutionEnvironmentCompositeCompartmentEditPartCN) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createMainFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ExecutionEnvironmentCompositeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ExecutionEnvironmentCompositeItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class ExecutionEnvironmentCompositeEditPartCN extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3083;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ExecutionEnvironmentCompositeEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ExecutionEnvironmentCompositeItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case PortEditPart.VISUAL_ID:

+					return new BorderItemResizableEditPolicy();

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new ExecutionEnvironmentCompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ExecutionEnvironmentCompositeFigure

+	 * 

+	 * @generated

+	 */

+	public ExecutionEnvironmentCompositeFigure getPrimaryShape() {

+		return (ExecutionEnvironmentCompositeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ExecutionEnvironmentCompositeNameEditPartCN) {

+			((ExecutionEnvironmentCompositeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof ExecutionEnvironmentCompositeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ExecutionEnvironmentCompositeCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ExecutionEnvironmentCompositeNameEditPartCN) {

+			return true;

+		}

+		if(childEditPart instanceof ExecutionEnvironmentCompositeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((ExecutionEnvironmentCompositeCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof ExecutionEnvironmentCompositeCompartmentEditPartCN) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		if(editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPart.java
index 7c0023445db..478d43d3fcb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5123;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ExecutionEnvironmentCompositeNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.ExecutionEnvironment_2071, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ExecutionEnvironmentCompositeNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ExecutionEnvironmentCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5123;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ExecutionEnvironmentCompositeNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.ExecutionEnvironment_2071, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ExecutionEnvironmentCompositeNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPartCN.java
index 31aaa481c45..294dd495149 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExecutionEnvironmentCompositeNameEditPartCN.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5139;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ExecutionEnvironmentCompositeNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.ExecutionEnvironment_3083, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ExecutionEnvironmentCompositeNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ExecutionEnvironmentCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5139;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ExecutionEnvironmentCompositeNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.ExecutionEnvironment_3083, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ExecutionEnvironmentCompositeNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionEditPart.java
index 6a1738bd458..d37114e35c8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionEditPart.java
@@ -1,239 +1,248 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ExpressionItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class ExpressionEditPart extends NodeEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2103;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ExpressionEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ExpressionItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeNamedElementFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 * @generated
-	 */
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ExpressionNameEditPart) {
-			((ExpressionNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ExpressionNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ExpressionNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ExpressionItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class ExpressionEditPart extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2103;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ExpressionEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ExpressionItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeNamedElementFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 * 

+	 * @generated

+	 */

+	public NodeNamedElementFigure getPrimaryShape() {

+		return (NodeNamedElementFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ExpressionNameEditPart) {

+			((ExpressionNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ExpressionNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ExpressionNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionNameEditPart.java
index 95bcdb61140..623e1655855 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ExpressionNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5186;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ExpressionNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Expression_2103, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ExpressionNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ExpressionNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5186;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ExpressionNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Expression_2103, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ExpressionNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPart.java
index e3d8da5ab5e..14fe9f533f6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPart.java
@@ -1,132 +1,126 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class FunctionBehaviorCompositeCompartmentEditPart
-		extends ShapeCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7067;
-
-	/**
-	 * @generated
-	 */
-	public FunctionBehaviorCompositeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.FunctionBehaviorCompositeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class FunctionBehaviorCompositeCompartmentEditPart extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7067;

+

+	/**

+	 * @generated

+	 */

+	public FunctionBehaviorCompositeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.FunctionBehaviorCompositeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPartCN.java
index 68776a793a9..d9e068e25c4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeCompartmentEditPartCN.java
@@ -1,132 +1,126 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class FunctionBehaviorCompositeCompartmentEditPartCN
-		extends ShapeCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7054;
-
-	/**
-	 * @generated
-	 */
-	public FunctionBehaviorCompositeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.FunctionBehaviorCompositeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class FunctionBehaviorCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7054;

+

+	/**

+	 * @generated

+	 */

+	public FunctionBehaviorCompositeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.FunctionBehaviorCompositeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPart.java
index 009a8661373..e09ab8242b9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPart.java
@@ -1,312 +1,332 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.FunctionBehaviorCompositeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.FunctionBehaviorCompositeItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class FunctionBehaviorCompositeEditPart extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2064;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public FunctionBehaviorCompositeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new FunctionBehaviorCompositeItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				switch (UMLVisualIDRegistry.getVisualID(childView)) {
-				case PortEditPart.VISUAL_ID:
-				case ParameterEditPart.VISUAL_ID:
-					return new BorderItemResizableEditPolicy();
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new FunctionBehaviorCompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.FunctionBehaviorCompositeFigure
-	 * @generated
-	 */
-	public FunctionBehaviorCompositeFigure getPrimaryShape() {
-		return (FunctionBehaviorCompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof FunctionBehaviorCompositeNameEditPart) {
-			((FunctionBehaviorCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof FunctionBehaviorCompositeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((FunctionBehaviorCompositeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof ParameterEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof FunctionBehaviorCompositeNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof FunctionBehaviorCompositeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((FunctionBehaviorCompositeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof ParameterEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof FunctionBehaviorCompositeCompartmentEditPart) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createMainFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(FunctionBehaviorCompositeNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.FunctionBehaviorCompositeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.FunctionBehaviorCompositeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class FunctionBehaviorCompositeEditPart extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2064;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public FunctionBehaviorCompositeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new FunctionBehaviorCompositeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case PortEditPart.VISUAL_ID:

+				case ParameterEditPart.VISUAL_ID:

+					return new BorderItemResizableEditPolicy();

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new FunctionBehaviorCompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.FunctionBehaviorCompositeFigure

+	 * 

+	 * @generated

+	 */

+	public FunctionBehaviorCompositeFigure getPrimaryShape() {

+		return (FunctionBehaviorCompositeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof FunctionBehaviorCompositeNameEditPart) {

+			((FunctionBehaviorCompositeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof FunctionBehaviorCompositeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((FunctionBehaviorCompositeCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof ParameterEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof FunctionBehaviorCompositeNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof FunctionBehaviorCompositeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((FunctionBehaviorCompositeCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof ParameterEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof FunctionBehaviorCompositeCompartmentEditPart) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		if(editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(FunctionBehaviorCompositeNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPartCN.java
index d0dac3c2ae8..dfb50d969a6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeEditPartCN.java
@@ -1,312 +1,332 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.FunctionBehaviorCompositeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.FunctionBehaviorCompositeItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class FunctionBehaviorCompositeEditPartCN extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3076;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public FunctionBehaviorCompositeEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new FunctionBehaviorCompositeItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				switch (UMLVisualIDRegistry.getVisualID(childView)) {
-				case PortEditPart.VISUAL_ID:
-				case ParameterEditPart.VISUAL_ID:
-					return new BorderItemResizableEditPolicy();
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new FunctionBehaviorCompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.FunctionBehaviorCompositeFigure
-	 * @generated
-	 */
-	public FunctionBehaviorCompositeFigure getPrimaryShape() {
-		return (FunctionBehaviorCompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof FunctionBehaviorCompositeNameEditPartCN) {
-			((FunctionBehaviorCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof FunctionBehaviorCompositeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((FunctionBehaviorCompositeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof ParameterEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof FunctionBehaviorCompositeNameEditPartCN) {
-			return true;
-		}
-		if (childEditPart instanceof FunctionBehaviorCompositeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((FunctionBehaviorCompositeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof ParameterEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof FunctionBehaviorCompositeCompartmentEditPartCN) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createMainFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(FunctionBehaviorCompositeNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.FunctionBehaviorCompositeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.FunctionBehaviorCompositeItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class FunctionBehaviorCompositeEditPartCN extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3076;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public FunctionBehaviorCompositeEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new FunctionBehaviorCompositeItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case PortEditPart.VISUAL_ID:

+				case ParameterEditPart.VISUAL_ID:

+					return new BorderItemResizableEditPolicy();

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new FunctionBehaviorCompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.FunctionBehaviorCompositeFigure

+	 * 

+	 * @generated

+	 */

+	public FunctionBehaviorCompositeFigure getPrimaryShape() {

+		return (FunctionBehaviorCompositeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof FunctionBehaviorCompositeNameEditPartCN) {

+			((FunctionBehaviorCompositeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof FunctionBehaviorCompositeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((FunctionBehaviorCompositeCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof ParameterEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof FunctionBehaviorCompositeNameEditPartCN) {

+			return true;

+		}

+		if(childEditPart instanceof FunctionBehaviorCompositeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((FunctionBehaviorCompositeCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof ParameterEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof FunctionBehaviorCompositeCompartmentEditPartCN) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		if(editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(FunctionBehaviorCompositeNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPart.java
index 9a002acf2e0..7b52e1cbcb3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5116;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public FunctionBehaviorCompositeNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.FunctionBehavior_2064, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.FunctionBehaviorCompositeNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class FunctionBehaviorCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5116;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public FunctionBehaviorCompositeNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.FunctionBehavior_2064, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.FunctionBehaviorCompositeNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPartCN.java
index bcb60b03e7e..7ca06c4823b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/FunctionBehaviorCompositeNameEditPartCN.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5132;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public FunctionBehaviorCompositeNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.FunctionBehavior_3076, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.FunctionBehaviorCompositeNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class FunctionBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5132;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public FunctionBehaviorCompositeNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.FunctionBehavior_3076, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.FunctionBehaviorCompositeNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationAppliedStereotypeEditPart.java
index c39d6b72766..e587654d3cf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationAppliedStereotypeEditPart.java
@@ -1,759 +1,752 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6024;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));
-	}
-
-	/**
-	 * @generated
-	 */
-	public GeneralizationAppliedStereotypeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Generalization_4015, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationAppliedStereotypeEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		// The label is read-only (defined in GMFGen model)
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class GeneralizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6024;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));

+	}

+

+	/**

+	 * @generated

+	 */

+	public GeneralizationAppliedStereotypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Generalization_4015, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationAppliedStereotypeEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		// The label is read-only (defined in GMFGen model)

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationEditPart.java
index 19e4be6c5a1..6d9466027fa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/GeneralizationEditPart.java
@@ -1,111 +1,108 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.edge.GeneralizationFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.GeneralizationItemSemanticEditPolicy;
-
-/**
- * @generated
- */
-public class GeneralizationEditPart extends UMLConnectionNodeEditPart
-		implements ITreeBranchEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4015;
-
-	/**
-	 * @generated
-	 */
-	public GeneralizationEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new GeneralizationItemSemanticEditPolicy());
-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof GeneralizationAppliedStereotypeEditPart) {
-			((GeneralizationAppliedStereotypeEditPart) childEditPart).setLabel(
-					getPrimaryShape().getAppliedStereotypeLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof GeneralizationAppliedStereotypeEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected Connection createConnectionFigure() {
-		return new GeneralizationFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	public GeneralizationFigure getPrimaryShape() {
-		return (GeneralizationFigure) getFigure();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

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

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.GeneralizationFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.GeneralizationItemSemanticEditPolicy;

+

+/**

+ * @generated

+ */

+public class GeneralizationEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 4015;

+

+	/**

+	 * @generated

+	 */

+	public GeneralizationEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new GeneralizationItemSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof GeneralizationAppliedStereotypeEditPart) {

+			((GeneralizationAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof GeneralizationAppliedStereotypeEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected Connection createConnectionFigure() {

+		return new GeneralizationFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public GeneralizationFigure getPrimaryShape() {

+		return (GeneralizationFigure)getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowAppliedStereotypeEditPart.java
index 62dbb5e8c7a..04dcaa27500 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowAppliedStereotypeEditPart.java
@@ -1,759 +1,752 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6032;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 15));
-	}
-
-	/**
-	 * @generated
-	 */
-	public InformationFlowAppliedStereotypeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.InformationFlow_4021, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowAppliedStereotypeEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		// The label is read-only (defined in GMFGen model)
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class InformationFlowAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6032;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 15));

+	}

+

+	/**

+	 * @generated

+	 */

+	public InformationFlowAppliedStereotypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.InformationFlow_4021, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowAppliedStereotypeEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		// The label is read-only (defined in GMFGen model)

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowConveyedLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowConveyedLabelEditPart.java
index 422b7046ae1..d21c8102ce2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowConveyedLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowConveyedLabelEditPart.java
@@ -1,770 +1,764 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.AbstractCustomLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.InformationFlowCustomLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6031;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowConveyedLabelEditPart.VISUAL_ID), new Point(0, 30));
-	}
-
-	/**
-	 * @generated
-	 */
-	public InformationFlowConveyedLabelEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-		installEditPolicy(AbstractCustomLabelEditPolicy.SPECIFIC_NAME_LABEL_POLICY, new InformationFlowCustomLabelEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		EObject element = resolveSemanticElement();
-		return element != null ? element : (View) getModel();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.InformationFlow_4021, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowConveyedLabelEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.AbstractCustomLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.InformationFlowCustomLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class InformationFlowConveyedLabelEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6031;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowConveyedLabelEditPart.VISUAL_ID), new Point(0, 30));

+	}

+

+	/**

+	 * @generated

+	 */

+	public InformationFlowConveyedLabelEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+		installEditPolicy(AbstractCustomLabelEditPolicy.SPECIFIC_NAME_LABEL_POLICY, new InformationFlowCustomLabelEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		EObject element = resolveSemanticElement();

+		return element != null ? element : (View)getModel();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.InformationFlow_4021, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowConveyedLabelEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowEditPart.java
index 90fb25ade20..dc504666854 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationFlowEditPart.java
@@ -1,120 +1,115 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeInformationFlowLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationFlowFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InformationFlowItemSemanticEditPolicy;
-
-/**
- * @generated
- */
-public class InformationFlowEditPart extends UMLConnectionNodeEditPart
-		implements ITreeBranchEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4021;
-
-	/**
-	 * @generated
-	 */
-	public InformationFlowEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InformationFlowItemSemanticEditPolicy());
-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeInformationFlowLabelDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof InformationFlowConveyedLabelEditPart) {
-			((InformationFlowConveyedLabelEditPart) childEditPart).setLabel(
-					getPrimaryShape().getConveyedLabel());
-			return true;
-		}
-		if (childEditPart instanceof InformationFlowAppliedStereotypeEditPart) {
-			((InformationFlowAppliedStereotypeEditPart) childEditPart).setLabel(
-					getPrimaryShape().getAppliedStereotypeLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof InformationFlowConveyedLabelEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof InformationFlowAppliedStereotypeEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected Connection createConnectionFigure() {
-		return new InformationFlowFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	public InformationFlowFigure getPrimaryShape() {
-		return (InformationFlowFigure) getFigure();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

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

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeInformationFlowLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationFlowFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InformationFlowItemSemanticEditPolicy;

+

+/**

+ * @generated

+ */

+public class InformationFlowEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 4021;

+

+	/**

+	 * @generated

+	 */

+	public InformationFlowEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InformationFlowItemSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeInformationFlowLabelDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof InformationFlowConveyedLabelEditPart) {

+			((InformationFlowConveyedLabelEditPart)childEditPart).setLabel(getPrimaryShape().getConveyedLabel());

+		}

+		if(childEditPart instanceof InformationFlowAppliedStereotypeEditPart) {

+			((InformationFlowAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof InformationFlowConveyedLabelEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof InformationFlowAppliedStereotypeEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected Connection createConnectionFigure() {

+		return new InformationFlowFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public InformationFlowFigure getPrimaryShape() {

+		return (InformationFlowFigure)getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPart.java
index c60a97c4555..674696bedbd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPart.java
@@ -1,250 +1,261 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationItemFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InformationItemItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class InformationItemEditPart extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2080;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public InformationItemEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InformationItemItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new InformationItemFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationItemFigure
-	 * @generated
-	 */
-	public InformationItemFigure getPrimaryShape() {
-		return (InformationItemFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof InformationItemNameEditPart) {
-			((InformationItemNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof InformationItemNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(80, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InformationItemNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationItemFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InformationItemItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class InformationItemEditPart extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2080;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public InformationItemEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InformationItemItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new InformationItemFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationItemFigure

+	 * 

+	 * @generated

+	 */

+	public InformationItemFigure getPrimaryShape() {

+		return (InformationItemFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof InformationItemNameEditPart) {

+			((InformationItemNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof InformationItemNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(80, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InformationItemNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPartCN.java
index e4b6b963034..697fc3b8a63 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemEditPartCN.java
@@ -1,250 +1,261 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationItemFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InformationItemItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class InformationItemEditPartCN extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3094;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public InformationItemEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InformationItemItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new InformationItemFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationItemFigure
-	 * @generated
-	 */
-	public InformationItemFigure getPrimaryShape() {
-		return (InformationItemFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof InformationItemNameEditPartCN) {
-			((InformationItemNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof InformationItemNameEditPartCN) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(80, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InformationItemNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationItemFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InformationItemItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class InformationItemEditPartCN extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3094;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public InformationItemEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InformationItemItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new InformationItemFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.InformationItemFigure

+	 * 

+	 * @generated

+	 */

+	public InformationItemFigure getPrimaryShape() {

+		return (InformationItemFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof InformationItemNameEditPartCN) {

+			((InformationItemNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof InformationItemNameEditPartCN) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(80, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InformationItemNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPart.java
index 14556542034..e27b4dbc08b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class InformationItemNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5163;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public InformationItemNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.InformationItem_2080, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationItemNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class InformationItemNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5163;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public InformationItemNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.InformationItem_2080, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationItemNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPartCN.java
index 7dc7e4344d6..5b2503549bc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InformationItemNameEditPartCN.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5147;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public InformationItemNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.InformationItem_3094, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationItemNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class InformationItemNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5147;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public InformationItemNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.InformationItem_3094, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationItemNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueEditPart.java
index d8ee1b4e332..744f1458d6d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueEditPart.java
@@ -1,239 +1,248 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InstanceValueItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class InstanceValueEditPart extends NodeEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2108;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public InstanceValueEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InstanceValueItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeNamedElementFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 * @generated
-	 */
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof InstanceValueNameEditPart) {
-			((InstanceValueNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof InstanceValueNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InstanceValueNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InstanceValueItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class InstanceValueEditPart extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2108;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public InstanceValueEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InstanceValueItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeNamedElementFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 * 

+	 * @generated

+	 */

+	public NodeNamedElementFigure getPrimaryShape() {

+		return (NodeNamedElementFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof InstanceValueNameEditPart) {

+			((InstanceValueNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof InstanceValueNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InstanceValueNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueNameEditPart.java
index dfa924e7d02..6eca1192198 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InstanceValueNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5191;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public InstanceValueNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.InstanceValue_2108, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InstanceValueNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class InstanceValueNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5191;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public InstanceValueNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.InstanceValue_2108, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InstanceValueNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPart.java
index b1f5351175b..18f7460b643 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPart.java
@@ -1,132 +1,126 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InteractionCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class InteractionCompositeCompartmentEditPart
-		extends ShapeCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7064;
-
-	/**
-	 * @generated
-	 */
-	public InteractionCompositeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.InteractionCompositeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InteractionCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InteractionCompositeCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class InteractionCompositeCompartmentEditPart extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7064;

+

+	/**

+	 * @generated

+	 */

+	public InteractionCompositeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.InteractionCompositeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InteractionCompositeCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPartCN.java
index 9959b6da486..47b1f9874d1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeCompartmentEditPartCN.java
@@ -1,132 +1,126 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InteractionCompositeCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class InteractionCompositeCompartmentEditPartCN
-		extends ShapeCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7051;
-
-	/**
-	 * @generated
-	 */
-	public InteractionCompositeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.InteractionCompositeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InteractionCompositeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InteractionCompositeCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class InteractionCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7051;

+

+	/**

+	 * @generated

+	 */

+	public InteractionCompositeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.InteractionCompositeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InteractionCompositeCompartmentItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPart.java
index 5f98c8ac244..f23d5e2070d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPart.java
@@ -1,312 +1,332 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.InteractionCompositeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InteractionCompositeItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class InteractionCompositeEditPart extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2061;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public InteractionCompositeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InteractionCompositeItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				switch (UMLVisualIDRegistry.getVisualID(childView)) {
-				case PortEditPart.VISUAL_ID:
-				case ParameterEditPart.VISUAL_ID:
-					return new BorderItemResizableEditPolicy();
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new InteractionCompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.InteractionCompositeFigure
-	 * @generated
-	 */
-	public InteractionCompositeFigure getPrimaryShape() {
-		return (InteractionCompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof InteractionCompositeNameEditPart) {
-			((InteractionCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof InteractionCompositeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((InteractionCompositeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof ParameterEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof InteractionCompositeNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof InteractionCompositeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((InteractionCompositeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof ParameterEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof InteractionCompositeCompartmentEditPart) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createMainFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InteractionCompositeNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.InteractionCompositeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InteractionCompositeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class InteractionCompositeEditPart extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2061;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public InteractionCompositeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InteractionCompositeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case PortEditPart.VISUAL_ID:

+				case ParameterEditPart.VISUAL_ID:

+					return new BorderItemResizableEditPolicy();

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new InteractionCompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.InteractionCompositeFigure

+	 * 

+	 * @generated

+	 */

+	public InteractionCompositeFigure getPrimaryShape() {

+		return (InteractionCompositeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof InteractionCompositeNameEditPart) {

+			((InteractionCompositeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof InteractionCompositeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((InteractionCompositeCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof ParameterEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof InteractionCompositeNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof InteractionCompositeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((InteractionCompositeCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof ParameterEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof InteractionCompositeCompartmentEditPart) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		if(editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InteractionCompositeNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPartCN.java
index 689d5db58c4..5c36b12a296 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeEditPartCN.java
@@ -1,312 +1,332 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.InteractionCompositeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InteractionCompositeItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class InteractionCompositeEditPartCN extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3073;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public InteractionCompositeEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InteractionCompositeItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				switch (UMLVisualIDRegistry.getVisualID(childView)) {
-				case PortEditPart.VISUAL_ID:
-				case ParameterEditPart.VISUAL_ID:
-					return new BorderItemResizableEditPolicy();
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new InteractionCompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.InteractionCompositeFigure
-	 * @generated
-	 */
-	public InteractionCompositeFigure getPrimaryShape() {
-		return (InteractionCompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof InteractionCompositeNameEditPartCN) {
-			((InteractionCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof InteractionCompositeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((InteractionCompositeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof ParameterEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof InteractionCompositeNameEditPartCN) {
-			return true;
-		}
-		if (childEditPart instanceof InteractionCompositeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((InteractionCompositeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof ParameterEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof InteractionCompositeCompartmentEditPartCN) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createMainFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InteractionCompositeNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.InteractionCompositeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InteractionCompositeItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class InteractionCompositeEditPartCN extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3073;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public InteractionCompositeEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InteractionCompositeItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case PortEditPart.VISUAL_ID:

+				case ParameterEditPart.VISUAL_ID:

+					return new BorderItemResizableEditPolicy();

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new InteractionCompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.InteractionCompositeFigure

+	 * 

+	 * @generated

+	 */

+	public InteractionCompositeFigure getPrimaryShape() {

+		return (InteractionCompositeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof InteractionCompositeNameEditPartCN) {

+			((InteractionCompositeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof InteractionCompositeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((InteractionCompositeCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof ParameterEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof InteractionCompositeNameEditPartCN) {

+			return true;

+		}

+		if(childEditPart instanceof InteractionCompositeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((InteractionCompositeCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof ParameterEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof InteractionCompositeCompartmentEditPartCN) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		if(editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InteractionCompositeNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPart.java
index 149ca0bad32..650fa9a5ab6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5113;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public InteractionCompositeNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Interaction_2061, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionCompositeNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class InteractionCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5113;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public InteractionCompositeNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Interaction_2061, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionCompositeNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPartCN.java
index a0c378b1e19..3074c02b8cd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionCompositeNameEditPartCN.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5129;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public InteractionCompositeNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Interaction_3073, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionCompositeNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class InteractionCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5129;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public InteractionCompositeNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Interaction_3073, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionCompositeNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPart.java
index df872d50fab..08211268473 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPart.java
@@ -1,253 +1,264 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InteractionConstraintItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class InteractionConstraintEditPart extends AbstractConstraintEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2113;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public InteractionConstraintEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InteractionConstraintItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new ConstraintFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure
-	 * @generated
-	 */
-	public ConstraintFigure getPrimaryShape() {
-		return (ConstraintFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof InteractionConstraintNameEditPart) {
-			((InteractionConstraintNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof InteractionConstraintSpecificationEditPart) {
-			((InteractionConstraintSpecificationEditPart) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof InteractionConstraintNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof InteractionConstraintSpecificationEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InteractionConstraintNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InteractionConstraintItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class InteractionConstraintEditPart extends AbstractConstraintEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2113;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public InteractionConstraintEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InteractionConstraintItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new ConstraintFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure

+	 * 

+	 * @generated

+	 */

+	public ConstraintFigure getPrimaryShape() {

+		return (ConstraintFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof InteractionConstraintNameEditPart) {

+			((InteractionConstraintNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+		if(childEditPart instanceof InteractionConstraintSpecificationEditPart) {

+			((InteractionConstraintSpecificationEditPart)childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof InteractionConstraintNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof InteractionConstraintSpecificationEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InteractionConstraintNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPartCN.java
index 29db66b543b..73a3436b929 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintEditPartCN.java
@@ -1,253 +1,264 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InteractionConstraintItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class InteractionConstraintEditPartCN extends AbstractConstraintEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3119;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public InteractionConstraintEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InteractionConstraintItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new ConstraintFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure
-	 * @generated
-	 */
-	public ConstraintFigure getPrimaryShape() {
-		return (ConstraintFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof InteractionConstraintNameEditPartCN) {
-			((InteractionConstraintNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof InteractionConstraintSpecificationEditPartCN) {
-			((InteractionConstraintSpecificationEditPartCN) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof InteractionConstraintNameEditPartCN) {
-			return true;
-		}
-		if (childEditPart instanceof InteractionConstraintSpecificationEditPartCN) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InteractionConstraintNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InteractionConstraintItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class InteractionConstraintEditPartCN extends AbstractConstraintEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3119;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public InteractionConstraintEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InteractionConstraintItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new ConstraintFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure

+	 * 

+	 * @generated

+	 */

+	public ConstraintFigure getPrimaryShape() {

+		return (ConstraintFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof InteractionConstraintNameEditPartCN) {

+			((InteractionConstraintNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+		if(childEditPart instanceof InteractionConstraintSpecificationEditPartCN) {

+			((InteractionConstraintSpecificationEditPartCN)childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof InteractionConstraintNameEditPartCN) {

+			return true;

+		}

+		if(childEditPart instanceof InteractionConstraintSpecificationEditPartCN) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InteractionConstraintNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPart.java
index 31f0437f5c4..8bb9dc0d694 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5196;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public InteractionConstraintNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.InteractionConstraint_2113, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionConstraintNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class InteractionConstraintNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5196;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public InteractionConstraintNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.InteractionConstraint_2113, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionConstraintNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPartCN.java
index b10c4e99a0d..f901d697d7c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintNameEditPartCN.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6046;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public InteractionConstraintNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.InteractionConstraint_3119, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionConstraintNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class InteractionConstraintNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6046;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public InteractionConstraintNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.InteractionConstraint_3119, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionConstraintNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPart.java
index efc0a896067..c76c9a0d4a2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPart.java
@@ -1,804 +1,801 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class InteractionConstraintSpecificationEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6038;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public InteractionConstraintSpecificationEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.InteractionConstraint_2113, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionConstraintSpecificationEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class InteractionConstraintSpecificationEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6038;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public InteractionConstraintSpecificationEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.InteractionConstraint_2113, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionConstraintSpecificationEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPartCN.java
index 53c4dc13111..716e6ec4e7a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InteractionConstraintSpecificationEditPartCN.java
@@ -1,804 +1,801 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6047;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public InteractionConstraintSpecificationEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.InteractionConstraint_3119, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionConstraintSpecificationEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class InteractionConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6047;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public InteractionConstraintSpecificationEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.InteractionConstraint_3119, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InteractionConstraintSpecificationEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPart.java
index 84ecf4a6d18..5020380a0ed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPart.java
@@ -1,252 +1,263 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.InterfaceCompositeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InterfaceItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class InterfaceEditPart extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2076;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public InterfaceEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InterfaceItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new InterfaceCompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.InterfaceCompositeFigure
-	 * @generated
-	 */
-	public InterfaceCompositeFigure getPrimaryShape() {
-		return (InterfaceCompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof InterfaceNameEditPart) {
-			((InterfaceNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof InterfaceNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.InterfaceCompositeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InterfaceItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class InterfaceEditPart extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2076;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public InterfaceEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InterfaceItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new InterfaceCompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.InterfaceCompositeFigure

+	 * 

+	 * @generated

+	 */

+	public InterfaceCompositeFigure getPrimaryShape() {

+		return (InterfaceCompositeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof InterfaceNameEditPart) {

+			((InterfaceNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof InterfaceNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPartCN.java
index 94d8fd4c3ce..19a1b0631f9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceEditPartCN.java
@@ -1,252 +1,263 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.InterfaceCompositeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InterfaceItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class InterfaceEditPartCN extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3087;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public InterfaceEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InterfaceItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new InterfaceCompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.InterfaceCompositeFigure
-	 * @generated
-	 */
-	public InterfaceCompositeFigure getPrimaryShape() {
-		return (InterfaceCompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof InterfaceNameEditPartCN) {
-			((InterfaceNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof InterfaceNameEditPartCN) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.InterfaceCompositeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InterfaceItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class InterfaceEditPartCN extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3087;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public InterfaceEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InterfaceItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new InterfaceCompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.InterfaceCompositeFigure

+	 * 

+	 * @generated

+	 */

+	public InterfaceCompositeFigure getPrimaryShape() {

+		return (InterfaceCompositeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof InterfaceNameEditPartCN) {

+			((InterfaceNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof InterfaceNameEditPartCN) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPart.java
index 78ba96fbabf..eb1dc734263 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5159;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public InterfaceNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Interface_2076, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class InterfaceNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5159;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public InterfaceNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Interface_2076, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPartCN.java
index 4f41493b5f4..fca639738c2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceNameEditPartCN.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5154;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public InterfaceNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Interface_3087, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class InterfaceNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5154;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public InterfaceNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Interface_3087, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationAppliedStereotypeEditPart.java
index 2ad276a8119..fc4a62c08f1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationAppliedStereotypeEditPart.java
@@ -1,759 +1,752 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6016;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));
-	}
-
-	/**
-	 * @generated
-	 */
-	public InterfaceRealizationAppliedStereotypeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.InterfaceRealization_4005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		// The label is read-only (defined in GMFGen model)
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class InterfaceRealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6016;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));

+	}

+

+	/**

+	 * @generated

+	 */

+	public InterfaceRealizationAppliedStereotypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.InterfaceRealization_4005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		// The label is read-only (defined in GMFGen model)

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationEditPart.java
index 94a0d635412..d5b22c98374 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationEditPart.java
@@ -1,119 +1,114 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InterfaceRealizationItemSemanticEditPolicy;
-
-/**
- * @generated
- */
-public class InterfaceRealizationEditPart extends UMLConnectionNodeEditPart
-		implements ITreeBranchEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4005;
-
-	/**
-	 * @generated
-	 */
-	public InterfaceRealizationEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InterfaceRealizationItemSemanticEditPolicy());
-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof InterfaceRealizationNameEditPart) {
-			((InterfaceRealizationNameEditPart) childEditPart).setLabel(
-					getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof InterfaceRealizationAppliedStereotypeEditPart) {
-			((InterfaceRealizationAppliedStereotypeEditPart) childEditPart).setLabel(
-					getPrimaryShape().getAppliedStereotypeLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof InterfaceRealizationNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof InterfaceRealizationAppliedStereotypeEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected Connection createConnectionFigure() {
-		return new InterfaceRealizationFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	public InterfaceRealizationFigure getPrimaryShape() {
-		return (InterfaceRealizationFigure) getFigure();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

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

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.InterfaceRealizationItemSemanticEditPolicy;

+

+/**

+ * @generated

+ */

+public class InterfaceRealizationEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 4005;

+

+	/**

+	 * @generated

+	 */

+	public InterfaceRealizationEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new InterfaceRealizationItemSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof InterfaceRealizationNameEditPart) {

+			((InterfaceRealizationNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		}

+		if(childEditPart instanceof InterfaceRealizationAppliedStereotypeEditPart) {

+			((InterfaceRealizationAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof InterfaceRealizationNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof InterfaceRealizationAppliedStereotypeEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected Connection createConnectionFigure() {

+		return new InterfaceRealizationFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public InterfaceRealizationFigure getPrimaryShape() {

+		return (InterfaceRealizationFigure)getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationNameEditPart.java
index ab0cc274a12..127ea16ffd7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/InterfaceRealizationNameEditPart.java
@@ -1,766 +1,760 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6002;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationNameEditPart.VISUAL_ID), new Point(0, 60));
-	}
-
-	/**
-	 * @generated
-	 */
-	public InterfaceRealizationNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.InterfaceRealization_4005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class InterfaceRealizationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6002;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationNameEditPart.VISUAL_ID), new Point(0, 60));

+	}

+

+	/**

+	 * @generated

+	 */

+	public InterfaceRealizationNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.InterfaceRealization_4005, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPart.java
index 0211564ed33..c9e17c02b7f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPart.java
@@ -1,253 +1,264 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.IntervalConstraintItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class IntervalConstraintEditPart extends AbstractConstraintEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2112;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public IntervalConstraintEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new IntervalConstraintItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new ConstraintFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure
-	 * @generated
-	 */
-	public ConstraintFigure getPrimaryShape() {
-		return (ConstraintFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof IntervalConstraintNameEditPart) {
-			((IntervalConstraintNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof IntervalConstraintSpecificationEditPart) {
-			((IntervalConstraintSpecificationEditPart) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof IntervalConstraintNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof IntervalConstraintSpecificationEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(IntervalConstraintNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.IntervalConstraintItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class IntervalConstraintEditPart extends AbstractConstraintEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2112;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public IntervalConstraintEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new IntervalConstraintItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new ConstraintFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure

+	 * 

+	 * @generated

+	 */

+	public ConstraintFigure getPrimaryShape() {

+		return (ConstraintFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof IntervalConstraintNameEditPart) {

+			((IntervalConstraintNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+		if(childEditPart instanceof IntervalConstraintSpecificationEditPart) {

+			((IntervalConstraintSpecificationEditPart)childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof IntervalConstraintNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof IntervalConstraintSpecificationEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(IntervalConstraintNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPartCN.java
index 546187668f8..e6acd9c6111 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintEditPartCN.java
@@ -1,253 +1,264 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.IntervalConstraintItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class IntervalConstraintEditPartCN extends AbstractConstraintEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3118;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public IntervalConstraintEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new IntervalConstraintItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new ConstraintFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure
-	 * @generated
-	 */
-	public ConstraintFigure getPrimaryShape() {
-		return (ConstraintFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof IntervalConstraintNameEditPartCN) {
-			((IntervalConstraintNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof IntervalConstraintSpecificationEditPartCN) {
-			((IntervalConstraintSpecificationEditPartCN) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof IntervalConstraintNameEditPartCN) {
-			return true;
-		}
-		if (childEditPart instanceof IntervalConstraintSpecificationEditPartCN) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(IntervalConstraintNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

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

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.IntervalConstraintItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class IntervalConstraintEditPartCN extends AbstractConstraintEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3118;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public IntervalConstraintEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new IntervalConstraintItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new ConstraintFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure

+	 * 

+	 * @generated

+	 */

+	public ConstraintFigure getPrimaryShape() {

+		return (ConstraintFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof IntervalConstraintNameEditPartCN) {

+			((IntervalConstraintNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+		if(childEditPart instanceof IntervalConstraintSpecificationEditPartCN) {

+			((IntervalConstraintSpecificationEditPartCN)childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof IntervalConstraintNameEditPartCN) {

+			return true;

+		}

+		if(childEditPart instanceof IntervalConstraintSpecificationEditPartCN) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(IntervalConstraintNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPart.java
index 8354b22cb39..203456c8a2b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5195;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public IntervalConstraintNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.IntervalConstraint_2112, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.IntervalConstraintNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class IntervalConstraintNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5195;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public IntervalConstraintNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.IntervalConstraint_2112, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.IntervalConstraintNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPartCN.java
index a27e1c459cf..036624f8875 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintNameEditPartCN.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6044;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public IntervalConstraintNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.IntervalConstraint_3118, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.IntervalConstraintNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class IntervalConstraintNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6044;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public IntervalConstraintNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.IntervalConstraint_3118, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.IntervalConstraintNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPart.java
index 8813cec88e8..eb0b2178693 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPart.java
@@ -1,804 +1,801 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6037;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public IntervalConstraintSpecificationEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.IntervalConstraint_2112, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.IntervalConstraintSpecificationEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class IntervalConstraintSpecificationEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6037;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public IntervalConstraintSpecificationEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.IntervalConstraint_2112, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.IntervalConstraintSpecificationEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPartCN.java
index 40e2d7004dc..f3b1db8fce0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalConstraintSpecificationEditPartCN.java
@@ -1,804 +1,801 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6045;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public IntervalConstraintSpecificationEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.IntervalConstraint_3118, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.IntervalConstraintSpecificationEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

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

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

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

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class IntervalConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6045;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public IntervalConstraintSpecificationEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.IntervalConstraint_3118, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.IntervalConstraintSpecificationEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

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

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalEditPart.java
index df618848abb..df7e6f03a21 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalEditPart.java
@@ -1,239 +1,248 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.IntervalItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class IntervalEditPart extends NodeEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2107;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public IntervalEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new IntervalItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeNamedElementFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 * @generated
-	 */
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof IntervalNameEditPart) {
-			((IntervalNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof IntervalNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(IntervalNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.IntervalItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class IntervalEditPart extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2107;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public IntervalEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new IntervalItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeNamedElementFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 * 

+	 * @generated

+	 */

+	public NodeNamedElementFigure getPrimaryShape() {

+		return (NodeNamedElementFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof IntervalNameEditPart) {

+			((IntervalNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof IntervalNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(IntervalNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalNameEditPart.java
index f3fc16d84a5..a733e45de46 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/IntervalNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5190;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public IntervalNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Interval_2107, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.IntervalNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class IntervalNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5190;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public IntervalNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Interval_2107, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.IntervalNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LinkDescriptorEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LinkDescriptorEditPart.java
index f82246f9a87..efe52a9b810 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LinkDescriptorEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LinkDescriptorEditPart.java
@@ -1,68 +1,67 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ViewComponentEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;
-import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure;
-
-/**
- * @generated
- */
-public class LinkDescriptorEditPart extends ConnectionEditPart
-		implements ITreeBranchEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4001;
-
-	/**
-	 * @generated
-	 */
-	public LinkDescriptorEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ViewComponentEditPolicy());
-		removeEditPolicy(EditPolicyRoles.SEMANTIC_ROLE);
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected Connection createConnectionFigure() {
-		return new SimpleDashedEdgeFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	public SimpleDashedEdgeFigure getPrimaryShape() {
-		return (SimpleDashedEdgeFigure) getFigure();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ViewComponentEditPolicy;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure;

+

+/**

+ * @generated

+ */

+public class LinkDescriptorEditPart extends ConnectionEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 4001;

+

+	/**

+	 * @generated

+	 */

+	public LinkDescriptorEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ViewComponentEditPolicy());

+		removeEditPolicy(EditPolicyRoles.SEMANTIC_ROLE);

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected Connection createConnectionFigure() {

+		return new SimpleDashedEdgeFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public SimpleDashedEdgeFigure getPrimaryShape() {

+		return (SimpleDashedEdgeFigure)getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanEditPart.java
index a233c4f7716..c62b0255a5f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanEditPart.java
@@ -1,239 +1,248 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.LiteralBooleanItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class LiteralBooleanEditPart extends NodeEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2095;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public LiteralBooleanEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new LiteralBooleanItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeNamedElementFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 * @generated
-	 */
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof LiteralBooleanNameEditPart) {
-			((LiteralBooleanNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof LiteralBooleanNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(LiteralBooleanNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.LiteralBooleanItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class LiteralBooleanEditPart extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2095;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public LiteralBooleanEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new LiteralBooleanItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeNamedElementFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 * 

+	 * @generated

+	 */

+	public NodeNamedElementFigure getPrimaryShape() {

+		return (NodeNamedElementFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof LiteralBooleanNameEditPart) {

+			((LiteralBooleanNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof LiteralBooleanNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(LiteralBooleanNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanNameEditPart.java
index 5b82d09342b..dda5c8add31 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralBooleanNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5178;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public LiteralBooleanNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.LiteralBoolean_2095, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralBooleanNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class LiteralBooleanNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5178;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public LiteralBooleanNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.LiteralBoolean_2095, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralBooleanNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerEditPart.java
index ba4ef50191f..ed984890383 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerEditPart.java
@@ -1,239 +1,248 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.LiteralIntegerItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class LiteralIntegerEditPart extends NodeEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2096;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public LiteralIntegerEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new LiteralIntegerItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeNamedElementFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 * @generated
-	 */
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof LiteralIntegerNameEditPart) {
-			((LiteralIntegerNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof LiteralIntegerNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(LiteralIntegerNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.LiteralIntegerItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class LiteralIntegerEditPart extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2096;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public LiteralIntegerEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new LiteralIntegerItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeNamedElementFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 * 

+	 * @generated

+	 */

+	public NodeNamedElementFigure getPrimaryShape() {

+		return (NodeNamedElementFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof LiteralIntegerNameEditPart) {

+			((LiteralIntegerNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof LiteralIntegerNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(LiteralIntegerNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerNameEditPart.java
index ced1dc35d02..9d724a42189 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralIntegerNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5179;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public LiteralIntegerNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.LiteralInteger_2096, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralIntegerNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class LiteralIntegerNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5179;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public LiteralIntegerNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.LiteralInteger_2096, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralIntegerNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullEditPart.java
index f851abdcde5..09a1279fa3e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullEditPart.java
@@ -1,239 +1,248 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.LiteralNullItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class LiteralNullEditPart extends NodeEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2097;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public LiteralNullEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new LiteralNullItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeNamedElementFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 * @generated
-	 */
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof LiteralNullNameEditPart) {
-			((LiteralNullNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof LiteralNullNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(LiteralNullNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.LiteralNullItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class LiteralNullEditPart extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2097;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public LiteralNullEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new LiteralNullItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeNamedElementFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 * 

+	 * @generated

+	 */

+	public NodeNamedElementFigure getPrimaryShape() {

+		return (NodeNamedElementFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof LiteralNullNameEditPart) {

+			((LiteralNullNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof LiteralNullNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(LiteralNullNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullNameEditPart.java
index 7c425738ac4..49b1a2ab011 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralNullNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5180;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public LiteralNullNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.LiteralNull_2097, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralNullNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class LiteralNullNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5180;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public LiteralNullNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.LiteralNull_2097, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralNullNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringEditPart.java
index 91858f336f4..8fbaa75e81b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringEditPart.java
@@ -1,239 +1,248 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.LiteralStringItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class LiteralStringEditPart extends NodeEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2098;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public LiteralStringEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new LiteralStringItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeNamedElementFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 * @generated
-	 */
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof LiteralStringNameEditPart) {
-			((LiteralStringNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof LiteralStringNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(LiteralStringNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.LiteralStringItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class LiteralStringEditPart extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2098;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public LiteralStringEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new LiteralStringItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeNamedElementFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 * 

+	 * @generated

+	 */

+	public NodeNamedElementFigure getPrimaryShape() {

+		return (NodeNamedElementFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof LiteralStringNameEditPart) {

+			((LiteralStringNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof LiteralStringNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(LiteralStringNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringNameEditPart.java
index 3b968fef927..7677b2a7138 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralStringNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5181;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public LiteralStringNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.LiteralString_2098, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralStringNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class LiteralStringNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5181;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public LiteralStringNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.LiteralString_2098, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralStringNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalEditPart.java
index 71e2acece72..9abc93fb964 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalEditPart.java
@@ -1,239 +1,248 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.LiteralUnlimitedNaturalItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class LiteralUnlimitedNaturalEditPart extends NodeEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2099;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public LiteralUnlimitedNaturalEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new LiteralUnlimitedNaturalItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeNamedElementFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 * @generated
-	 */
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof LiteralUnlimitedNaturalNameEditPart) {
-			((LiteralUnlimitedNaturalNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof LiteralUnlimitedNaturalNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(LiteralUnlimitedNaturalNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.LiteralUnlimitedNaturalItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class LiteralUnlimitedNaturalEditPart extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2099;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public LiteralUnlimitedNaturalEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new LiteralUnlimitedNaturalItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeNamedElementFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 * 

+	 * @generated

+	 */

+	public NodeNamedElementFigure getPrimaryShape() {

+		return (NodeNamedElementFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof LiteralUnlimitedNaturalNameEditPart) {

+			((LiteralUnlimitedNaturalNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof LiteralUnlimitedNaturalNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(LiteralUnlimitedNaturalNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalNameEditPart.java
index 18c8e5442b2..06b67d7ef91 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/LiteralUnlimitedNaturalNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5182;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public LiteralUnlimitedNaturalNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.LiteralUnlimitedNatural_2099, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralUnlimitedNaturalNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class LiteralUnlimitedNaturalNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5182;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public LiteralUnlimitedNaturalNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.LiteralUnlimitedNatural_2099, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.LiteralUnlimitedNaturalNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationAppliedStereotypeEditPart.java
index c601c8977c3..06355ec4e8d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationAppliedStereotypeEditPart.java
@@ -1,759 +1,752 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6019;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ManifestationAppliedStereotypeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Manifestation_4012, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationAppliedStereotypeEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		// The label is read-only (defined in GMFGen model)
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ManifestationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6019;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ManifestationAppliedStereotypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Manifestation_4012, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationAppliedStereotypeEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		// The label is read-only (defined in GMFGen model)

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationEditPart.java
index b28a88e8c6e..be961e2aad0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationEditPart.java
@@ -1,120 +1,115 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeManifestationLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ManifestationItemSemanticEditPolicy;
-
-/**
- * @generated
- */
-public class ManifestationEditPart extends UMLConnectionNodeEditPart
-		implements ITreeBranchEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4012;
-
-	/**
-	 * @generated
-	 */
-	public ManifestationEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ManifestationItemSemanticEditPolicy());
-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeManifestationLabelDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ManifestationNameEditPart) {
-			((ManifestationNameEditPart) childEditPart).setLabel(
-					getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof ManifestationAppliedStereotypeEditPart) {
-			((ManifestationAppliedStereotypeEditPart) childEditPart).setLabel(
-					getPrimaryShape().getAppliedStereotypeLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ManifestationNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof ManifestationAppliedStereotypeEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected Connection createConnectionFigure() {
-		return new DashedEdgeFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	public DashedEdgeFigure getPrimaryShape() {
-		return (DashedEdgeFigure) getFigure();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeManifestationLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ManifestationItemSemanticEditPolicy;

+

+/**

+ * @generated

+ */

+public class ManifestationEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 4012;

+

+	/**

+	 * @generated

+	 */

+	public ManifestationEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ManifestationItemSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeManifestationLabelDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ManifestationNameEditPart) {

+			((ManifestationNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		}

+		if(childEditPart instanceof ManifestationAppliedStereotypeEditPart) {

+			((ManifestationAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ManifestationNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof ManifestationAppliedStereotypeEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected Connection createConnectionFigure() {

+		return new DashedEdgeFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public DashedEdgeFigure getPrimaryShape() {

+		return (DashedEdgeFigure)getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationNameEditPart.java
index 94edb40f946..f5695511375 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ManifestationNameEditPart.java
@@ -1,766 +1,760 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ManifestationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6005;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationNameEditPart.VISUAL_ID), new Point(0, 60));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ManifestationNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Manifestation_4012, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ManifestationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6005;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationNameEditPart.VISUAL_ID), new Point(0, 60));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ManifestationNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Manifestation_4012, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPart.java
index 6ba335f4438..064784b03d0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPart.java
@@ -1,132 +1,126 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.NodeCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class NodeCompositeCompartmentEditPart
-		extends ShapeCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7072;
-
-	/**
-	 * @generated
-	 */
-	public NodeCompositeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.NodeCompositeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new NodeCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.NodeCompositeCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class NodeCompositeCompartmentEditPart extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7072;

+

+	/**

+	 * @generated

+	 */

+	public NodeCompositeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.NodeCompositeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new NodeCompositeCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPartCN.java
index 63553752a1b..e334932b844 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeCompartmentEditPartCN.java
@@ -1,132 +1,126 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.NodeCompositeCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class NodeCompositeCompartmentEditPartCN
-		extends ShapeCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7059;
-
-	/**
-	 * @generated
-	 */
-	public NodeCompositeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.NodeCompositeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new NodeCompositeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.NodeCompositeCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class NodeCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7059;

+

+	/**

+	 * @generated

+	 */

+	public NodeCompositeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.NodeCompositeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new NodeCompositeCompartmentItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPart.java
index fe732f8301f..7131e3bd022 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPart.java
@@ -1,303 +1,319 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.NodeCompositeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.NodeCompositeItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class NodeCompositeEditPart extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2072;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public NodeCompositeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new NodeCompositeItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				switch (UMLVisualIDRegistry.getVisualID(childView)) {
-				case PortEditPart.VISUAL_ID:
-					return new BorderItemResizableEditPolicy();
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeCompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.NodeCompositeFigure
-	 * @generated
-	 */
-	public NodeCompositeFigure getPrimaryShape() {
-		return (NodeCompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof NodeCompositeNameEditPart) {
-			((NodeCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof NodeCompositeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((NodeCompositeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof NodeCompositeNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof NodeCompositeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((NodeCompositeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof NodeCompositeCompartmentEditPart) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createMainFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(NodeCompositeNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.NodeCompositeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.NodeCompositeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class NodeCompositeEditPart extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2072;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public NodeCompositeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new NodeCompositeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case PortEditPart.VISUAL_ID:

+					return new BorderItemResizableEditPolicy();

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeCompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.NodeCompositeFigure

+	 * 

+	 * @generated

+	 */

+	public NodeCompositeFigure getPrimaryShape() {

+		return (NodeCompositeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof NodeCompositeNameEditPart) {

+			((NodeCompositeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof NodeCompositeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((NodeCompositeCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof NodeCompositeNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof NodeCompositeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((NodeCompositeCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof NodeCompositeCompartmentEditPart) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		if(editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(NodeCompositeNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPartCN.java
index d8b2180e9fc..eff09000332 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeEditPartCN.java
@@ -1,303 +1,319 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.NodeCompositeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.NodeCompositeItemSemanticEditPolicycN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class NodeCompositeEditPartCN extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3084;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public NodeCompositeEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new NodeCompositeItemSemanticEditPolicycN());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				switch (UMLVisualIDRegistry.getVisualID(childView)) {
-				case PortEditPart.VISUAL_ID:
-					return new BorderItemResizableEditPolicy();
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeCompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.NodeCompositeFigure
-	 * @generated
-	 */
-	public NodeCompositeFigure getPrimaryShape() {
-		return (NodeCompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof NodeCompositeNameEditPartCN) {
-			((NodeCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof NodeCompositeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((NodeCompositeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof NodeCompositeNameEditPartCN) {
-			return true;
-		}
-		if (childEditPart instanceof NodeCompositeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((NodeCompositeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof NodeCompositeCompartmentEditPartCN) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createMainFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(NodeCompositeNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.StructuredClassifierLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.NodeCompositeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.NodeCompositeItemSemanticEditPolicycN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class NodeCompositeEditPartCN extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3084;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public NodeCompositeEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new NodeCompositeItemSemanticEditPolicycN());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new StructuredClassifierLayoutEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case PortEditPart.VISUAL_ID:

+					return new BorderItemResizableEditPolicy();

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeCompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.NodeCompositeFigure

+	 * 

+	 * @generated

+	 */

+	public NodeCompositeFigure getPrimaryShape() {

+		return (NodeCompositeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof NodeCompositeNameEditPartCN) {

+			((NodeCompositeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof NodeCompositeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((NodeCompositeCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof NodeCompositeNameEditPartCN) {

+			return true;

+		}

+		if(childEditPart instanceof NodeCompositeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((NodeCompositeCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof NodeCompositeCompartmentEditPartCN) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		if(editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(NodeCompositeNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPart.java
index 445e089402e..65d4be22e90 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5124;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public NodeCompositeNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Node_2072, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.NodeCompositeNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class NodeCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5124;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public NodeCompositeNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Node_2072, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.NodeCompositeNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPartCN.java
index 06148b41d17..330347d8bbc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/NodeCompositeNameEditPartCN.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5140;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public NodeCompositeNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Node_3084, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.NodeCompositeNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class NodeCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5140;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public NodeCompositeNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Node_3084, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.NodeCompositeNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPart.java
index 5ca2675e2c2..94e2b42000c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPart.java
@@ -1,132 +1,126 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class OpaqueBehaviorCompositeCompartmentEditPart
-		extends ShapeCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7068;
-
-	/**
-	 * @generated
-	 */
-	public OpaqueBehaviorCompositeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.OpaqueBehaviorCompositeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class OpaqueBehaviorCompositeCompartmentEditPart extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7068;

+

+	/**

+	 * @generated

+	 */

+	public OpaqueBehaviorCompositeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.OpaqueBehaviorCompositeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPartCN.java
index 73c6217b8c5..cca24b66357 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeCompartmentEditPartCN.java
@@ -1,132 +1,126 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class OpaqueBehaviorCompositeCompartmentEditPartCN
-		extends ShapeCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7055;
-
-	/**
-	 * @generated
-	 */
-	public OpaqueBehaviorCompositeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.OpaqueBehaviorCompositeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class OpaqueBehaviorCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7055;

+

+	/**

+	 * @generated

+	 */

+	public OpaqueBehaviorCompositeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.OpaqueBehaviorCompositeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPart.java
index 95a0c121908..c08f38da123 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPart.java
@@ -1,312 +1,332 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.OpaqueBehaviorCompositeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.OpaqueBehaviorCompositeItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class OpaqueBehaviorCompositeEditPart extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2065;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public OpaqueBehaviorCompositeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new OpaqueBehaviorCompositeItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				switch (UMLVisualIDRegistry.getVisualID(childView)) {
-				case PortEditPart.VISUAL_ID:
-				case ParameterEditPart.VISUAL_ID:
-					return new BorderItemResizableEditPolicy();
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new OpaqueBehaviorCompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.OpaqueBehaviorCompositeFigure
-	 * @generated
-	 */
-	public OpaqueBehaviorCompositeFigure getPrimaryShape() {
-		return (OpaqueBehaviorCompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof OpaqueBehaviorCompositeNameEditPart) {
-			((OpaqueBehaviorCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof OpaqueBehaviorCompositeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((OpaqueBehaviorCompositeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof ParameterEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof OpaqueBehaviorCompositeNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof OpaqueBehaviorCompositeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((OpaqueBehaviorCompositeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof ParameterEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof OpaqueBehaviorCompositeCompartmentEditPart) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createMainFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.OpaqueBehaviorCompositeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.OpaqueBehaviorCompositeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class OpaqueBehaviorCompositeEditPart extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2065;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public OpaqueBehaviorCompositeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new OpaqueBehaviorCompositeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case PortEditPart.VISUAL_ID:

+				case ParameterEditPart.VISUAL_ID:

+					return new BorderItemResizableEditPolicy();

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new OpaqueBehaviorCompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.OpaqueBehaviorCompositeFigure

+	 * 

+	 * @generated

+	 */

+	public OpaqueBehaviorCompositeFigure getPrimaryShape() {

+		return (OpaqueBehaviorCompositeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof OpaqueBehaviorCompositeNameEditPart) {

+			((OpaqueBehaviorCompositeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof OpaqueBehaviorCompositeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((OpaqueBehaviorCompositeCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof ParameterEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof OpaqueBehaviorCompositeNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof OpaqueBehaviorCompositeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((OpaqueBehaviorCompositeCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof ParameterEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof OpaqueBehaviorCompositeCompartmentEditPart) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		if(editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPartCN.java
index b9f082eceac..68d2e5434e5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeEditPartCN.java
@@ -1,312 +1,332 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.OpaqueBehaviorCompositeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.OpaqueBehaviorCompositeItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class OpaqueBehaviorCompositeEditPartCN extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3077;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public OpaqueBehaviorCompositeEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new OpaqueBehaviorCompositeItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				switch (UMLVisualIDRegistry.getVisualID(childView)) {
-				case PortEditPart.VISUAL_ID:
-				case ParameterEditPart.VISUAL_ID:
-					return new BorderItemResizableEditPolicy();
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new OpaqueBehaviorCompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.OpaqueBehaviorCompositeFigure
-	 * @generated
-	 */
-	public OpaqueBehaviorCompositeFigure getPrimaryShape() {
-		return (OpaqueBehaviorCompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof OpaqueBehaviorCompositeNameEditPartCN) {
-			((OpaqueBehaviorCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof OpaqueBehaviorCompositeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((OpaqueBehaviorCompositeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof ParameterEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof OpaqueBehaviorCompositeNameEditPartCN) {
-			return true;
-		}
-		if (childEditPart instanceof OpaqueBehaviorCompositeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((OpaqueBehaviorCompositeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof ParameterEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof OpaqueBehaviorCompositeCompartmentEditPartCN) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createMainFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.OpaqueBehaviorCompositeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.OpaqueBehaviorCompositeItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class OpaqueBehaviorCompositeEditPartCN extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3077;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public OpaqueBehaviorCompositeEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new OpaqueBehaviorCompositeItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case PortEditPart.VISUAL_ID:

+				case ParameterEditPart.VISUAL_ID:

+					return new BorderItemResizableEditPolicy();

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new OpaqueBehaviorCompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.OpaqueBehaviorCompositeFigure

+	 * 

+	 * @generated

+	 */

+	public OpaqueBehaviorCompositeFigure getPrimaryShape() {

+		return (OpaqueBehaviorCompositeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof OpaqueBehaviorCompositeNameEditPartCN) {

+			((OpaqueBehaviorCompositeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof OpaqueBehaviorCompositeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((OpaqueBehaviorCompositeCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof ParameterEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof OpaqueBehaviorCompositeNameEditPartCN) {

+			return true;

+		}

+		if(childEditPart instanceof OpaqueBehaviorCompositeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((OpaqueBehaviorCompositeCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof ParameterEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof OpaqueBehaviorCompositeCompartmentEditPartCN) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		if(editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPart.java
index 58568c50892..16fe94c81b4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5117;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public OpaqueBehaviorCompositeNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.OpaqueBehavior_2065, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.OpaqueBehaviorCompositeNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class OpaqueBehaviorCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5117;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public OpaqueBehaviorCompositeNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.OpaqueBehavior_2065, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.OpaqueBehaviorCompositeNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPartCN.java
index 32e3db9297a..7e26d2ba9b6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueBehaviorCompositeNameEditPartCN.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5133;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public OpaqueBehaviorCompositeNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.OpaqueBehavior_3077, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.OpaqueBehaviorCompositeNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class OpaqueBehaviorCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5133;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public OpaqueBehaviorCompositeNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.OpaqueBehavior_3077, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.OpaqueBehaviorCompositeNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionEditPart.java
index b56dc523143..3ae6fc38b26 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionEditPart.java
@@ -1,239 +1,248 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.OpaqueExpressionItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class OpaqueExpressionEditPart extends NodeEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2101;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public OpaqueExpressionEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new OpaqueExpressionItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeNamedElementFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 * @generated
-	 */
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof OpaqueExpressionNameEditPart) {
-			((OpaqueExpressionNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof OpaqueExpressionNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(OpaqueExpressionNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.OpaqueExpressionItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class OpaqueExpressionEditPart extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2101;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public OpaqueExpressionEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new OpaqueExpressionItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeNamedElementFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 * 

+	 * @generated

+	 */

+	public NodeNamedElementFigure getPrimaryShape() {

+		return (NodeNamedElementFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof OpaqueExpressionNameEditPart) {

+			((OpaqueExpressionNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof OpaqueExpressionNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(OpaqueExpressionNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionNameEditPart.java
index dde31a676d4..7820e21513f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OpaqueExpressionNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5184;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public OpaqueExpressionNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.OpaqueExpression_2101, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.OpaqueExpressionNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class OpaqueExpressionNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5184;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public OpaqueExpressionNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.OpaqueExpression_2101, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.OpaqueExpressionNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OperationEditPartCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OperationEditPartCLN.java
index ea115e9d24a..72f05b292a8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OperationEditPartCLN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/OperationEditPartCLN.java
@@ -1,824 +1,817 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.requests.SelectionRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ListItemComponentEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.OperationItemSemanticEditPolicyCLN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextNonResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class OperationEditPartCLN extends CompartmentEditPart
-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3102;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public OperationEditPartCLN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public DragTracker getDragTracker(Request request) {
-		if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) {
-			return null;
-		}
-		return new DragEditPartsTrackerEx(this);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new OperationItemSemanticEditPolicyCLN());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());
-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Operation_3102, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.OperationEditPartCLN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) {
-			refreshUnderline();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new WrappingLabel();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public boolean isSelectable() {
-		return getFigure().isShowing();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.DragTracker;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.requests.SelectionRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ListItemComponentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.OperationItemSemanticEditPolicyCLN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class OperationEditPartCLN extends CompartmentEditPart implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3102;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public OperationEditPartCLN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public DragTracker getDragTracker(Request request) {

+		if(request instanceof SelectionRequest && ((SelectionRequest)request).getLastButtonPressed() == 3) {

+			return null;

+		}

+		return new DragEditPartsTrackerEx(this);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new OperationItemSemanticEditPolicyCLN());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

+		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Operation_3102, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.OperationEditPartCLN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		if(UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) {

+			refreshUnderline();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new WrappingLabel();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public boolean isSelectable() {

+		return getFigure().isShowing();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterAppliedStereotypeEditPart.java
index 9636a681c6b..1b876555489 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterAppliedStereotypeEditPart.java
@@ -1,788 +1,779 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ParameterAppliedStereotypeEditPart extends LabelEditPart
-		implements ITextAwareEditPart, IBorderItemEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6034;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ParameterAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 0));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParameterAppliedStereotypeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeExternalNodeEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public IBorderItemLocator getBorderItemLocator() {
-		IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator) constraint;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void refreshBounds() {
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Parameter_3088, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ParameterAppliedStereotypeEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		// The label is read-only (defined in GMFGen model)
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new AppliedStereotypeWrappingLabelFigure();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ParameterAppliedStereotypeEditPart extends LabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6034;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ParameterAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParameterAppliedStereotypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeExternalNodeEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

+			return (IBorderItemLocator)constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Parameter_3088, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ParameterAppliedStereotypeEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		// The label is read-only (defined in GMFGen model)

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new AppliedStereotypeWrappingLabelFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterEditPart.java
index f93643f9127..18d2e9bf6fc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterEditPart.java
@@ -1,260 +1,268 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.StackLayout;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.handles.MoveHandle;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractBorderEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomParameterItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.ParameterLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ParameterFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ParameterItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class ParameterEditPart extends AbstractBorderEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3088;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ParameterEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, getPrimaryDragEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ParameterItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomParameterItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeIconlDisplayEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new ParameterLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				switch (UMLVisualIDRegistry.getVisualID(childView)) {
-				case ParameterNameEditPart.VISUAL_ID:
-				case ParameterAppliedStereotypeEditPart.VISUAL_ID:
-					return new BorderItemSelectionEditPolicy() {
-						protected List<?> createSelectionHandles() {
-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());
-							mh.setBorder(null);
-							return Collections.singletonList(mh);
-						}
-					}
-					;
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		/*
-		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart
-		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!
-		 */
-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {
-			Object notifier = event.getNotifier();
-			List<?> modelChildren = ((View) getModel()).getChildren();
-			if (!(notifier instanceof Edge)) {
-				if (modelChildren.contains(event.getNotifier())) {
-					return;
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new ParameterFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ParameterFigure
-	 * @generated
-	 */
-	public ParameterFigure getPrimaryShape() {
-		return (ParameterFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {
-		if (borderItemEditPart instanceof ParameterNameEditPart) {
-			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());
-			borderItemContainer.add(borderItemEditPart.getFigure(), locator);
-		} else if (borderItemEditPart instanceof ParameterAppliedStereotypeEditPart) {
-			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());
-			borderItemContainer.add(borderItemEditPart.getFigure(), locator);
-		} else
-		{
-			super.addBorderItem(borderItemContainer, borderItemEditPart);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createMainFigure() {
-		NodeFigure figure = createNodePlate();
-		figure.setLayoutManager(new StackLayout());
-		IFigure shape = createNodeShape();
-		figure.add(shape);
-		contentPane = setupContentPane(shape);
-		return figure;
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ParameterNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractBorderEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomParameterItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.ParameterLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ParameterFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ParameterItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class ParameterEditPart extends AbstractBorderEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3088;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ParameterEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, getPrimaryDragEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ParameterItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomParameterItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeIconlDisplayEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new ParameterLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case ParameterNameEditPart.VISUAL_ID:

+				case ParameterAppliedStereotypeEditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy() {

+

+						protected List<?> createSelectionHandles() {

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

+							mh.setBorder(null);

+							return Collections.singletonList(mh);

+						}

+					};

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		/*

+		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

+		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

+		 */

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+			Object notifier = event.getNotifier();

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

+					return;

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new ParameterFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ParameterFigure

+	 * 

+	 * @generated

+	 */

+	public ParameterFigure getPrimaryShape() {

+		return (ParameterFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

+		if(borderItemEditPart instanceof ParameterNameEditPart) {

+			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else if(borderItemEditPart instanceof ParameterAppliedStereotypeEditPart) {

+			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		NodeFigure figure = createNodePlate();

+		figure.setLayoutManager(new StackLayout());

+		IFigure shape = createNodeShape();

+		figure.add(shape);

+		contentPane = setupContentPane(shape);

+		return figure;

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ParameterNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterNameEditPart.java
index 40fddc50901..736d456e973 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ParameterNameEditPart.java
@@ -1,805 +1,797 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.ParameterLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ParameterNameEditPart extends LabelEditPart
-		implements ITextAwareEditPart, IBorderItemEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6033;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ParameterNameEditPart.VISUAL_ID), new Point(0, 0));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParameterNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new ParameterLabelEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public IBorderItemLocator getBorderItemLocator() {
-		IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator) constraint;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void refreshBounds() {
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Parameter_3088, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ParameterNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new WrappingLabel();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.ParameterLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ParameterNameEditPart extends LabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6033;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ParameterNameEditPart.VISUAL_ID), new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParameterNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new ParameterLabelEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

+			return (IBorderItemLocator)constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Parameter_3088, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ParameterNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new WrappingLabel();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortAppliedStereotypeEditPart.java
index 6861fc8be38..56583cbcffc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortAppliedStereotypeEditPart.java
@@ -1,789 +1,779 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class PortAppliedStereotypeEditPart extends
-		AbstractLabelEditPart
-		implements ITextAwareEditPart, IBorderItemEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6029;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 0));
-	}
-
-	/**
-	 * @generated
-	 */
-	public PortAppliedStereotypeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeExternalNodeEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public IBorderItemLocator getBorderItemLocator() {
-		IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator) constraint;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void refreshBounds() {
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Port_3069, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortAppliedStereotypeEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		// The label is read-only (defined in GMFGen model)
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new AppliedStereotypeWrappingLabelFigure();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class PortAppliedStereotypeEditPart extends AbstractLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6029;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public PortAppliedStereotypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeExternalNodeEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

+			return (IBorderItemLocator)constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Port_3069, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortAppliedStereotypeEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		// The label is read-only (defined in GMFGen model)

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new AppliedStereotypeWrappingLabelFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortEditPart.java
index c5322b86fd8..8d71ae9ed9e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortEditPart.java
@@ -1,262 +1,270 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.StackLayout;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.handles.MoveHandle;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractBorderEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorPortEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomPortItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.PortFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.PortItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class PortEditPart extends AbstractBorderEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3069;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public PortEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, getPrimaryDragEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PortItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomPortItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeIconlDisplayEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new PortLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());
-		installEditPolicy(BehaviorPortEditPolicy.BEHAVIOR_PORT, new BehaviorPortEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				switch (UMLVisualIDRegistry.getVisualID(childView)) {
-				case PortNameEditPart.VISUAL_ID:
-				case PortAppliedStereotypeEditPart.VISUAL_ID:
-					return new BorderItemSelectionEditPolicy() {
-						protected List<?> createSelectionHandles() {
-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());
-							mh.setBorder(null);
-							return Collections.singletonList(mh);
-						}
-					}
-					;
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		/*
-		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart
-		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!
-		 */
-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {
-			Object notifier = event.getNotifier();
-			List<?> modelChildren = ((View) getModel()).getChildren();
-			if (!(notifier instanceof Edge)) {
-				if (modelChildren.contains(event.getNotifier())) {
-					return;
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new PortFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.PortFigure
-	 * @generated
-	 */
-	public PortFigure getPrimaryShape() {
-		return (PortFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {
-		if (borderItemEditPart instanceof PortNameEditPart) {
-			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());
-			borderItemContainer.add(borderItemEditPart.getFigure(), locator);
-		} else if (borderItemEditPart instanceof PortAppliedStereotypeEditPart) {
-			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());
-			borderItemContainer.add(borderItemEditPart.getFigure(), locator);
-		} else
-		{
-			super.addBorderItem(borderItemContainer, borderItemEditPart);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createMainFigure() {
-		NodeFigure figure = createNodePlate();
-		figure.setLayoutManager(new StackLayout());
-		IFigure shape = createNodeShape();
-		figure.add(shape);
-		contentPane = setupContentPane(shape);
-		return figure;
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PortNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.StackLayout;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractBorderEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorPortEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomPortItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.PortFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.PortItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class PortEditPart extends AbstractBorderEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3069;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public PortEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, getPrimaryDragEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PortItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomPortItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeIconlDisplayEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new PortLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());

+		installEditPolicy(BehaviorPortEditPolicy.BEHAVIOR_PORT, new BehaviorPortEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case PortNameEditPart.VISUAL_ID:

+				case PortAppliedStereotypeEditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy() {

+

+						protected List<?> createSelectionHandles() {

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

+							mh.setBorder(null);

+							return Collections.singletonList(mh);

+						}

+					};

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		/*

+		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

+		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

+		 */

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+			Object notifier = event.getNotifier();

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

+					return;

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new PortFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.PortFigure

+	 * 

+	 * @generated

+	 */

+	public PortFigure getPrimaryShape() {

+		return (PortFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

+		if(borderItemEditPart instanceof PortNameEditPart) {

+			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else if(borderItemEditPart instanceof PortAppliedStereotypeEditPart) {

+			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(20, 20);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		NodeFigure figure = createNodePlate();

+		figure.setLayoutManager(new StackLayout());

+		IFigure shape = createNodeShape();

+		figure.add(shape);

+		contentPane = setupContentPane(shape);

+		return figure;

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PortNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortNameEditPart.java
index b6c8069bcc9..7978508c778 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PortNameEditPart.java
@@ -1,805 +1,797 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PortLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class PortNameEditPart extends LabelEditPart
-		implements ITextAwareEditPart, IBorderItemEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5125;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortNameEditPart.VISUAL_ID), new Point(0, 0));
-	}
-
-	/**
-	 * @generated
-	 */
-	public PortNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new PortLabelEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public IBorderItemLocator getBorderItemLocator() {
-		IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator) constraint;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void refreshBounds() {
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Port_3069, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new WrappingLabel();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PortLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class PortNameEditPart extends LabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5125;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortNameEditPart.VISUAL_ID), new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public PortNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new PortLabelEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

+			return (IBorderItemLocator)constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Port_3069, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PortNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new WrappingLabel();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPart.java
index d6a43906aca..258af0c2215 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPart.java
@@ -1,252 +1,263 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.PrimitiveTypeItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class PrimitiveTypeEditPart extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2066;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public PrimitiveTypeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PrimitiveTypeItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new PrimitiveTypeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure
-	 * @generated
-	 */
-	public PrimitiveTypeFigure getPrimaryShape() {
-		return (PrimitiveTypeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof PrimitiveTypeNameEditPart) {
-			((PrimitiveTypeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof PrimitiveTypeNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.PrimitiveTypeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class PrimitiveTypeEditPart extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2066;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public PrimitiveTypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PrimitiveTypeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new PrimitiveTypeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure

+	 * 

+	 * @generated

+	 */

+	public PrimitiveTypeFigure getPrimaryShape() {

+		return (PrimitiveTypeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof PrimitiveTypeNameEditPart) {

+			((PrimitiveTypeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof PrimitiveTypeNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPartCN.java
index 0f7ff6d0cb2..d9f735fe8eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeEditPartCN.java
@@ -1,252 +1,263 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.PrimitiveTypeItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class PrimitiveTypeEditPartCN extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3078;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public PrimitiveTypeEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PrimitiveTypeItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new PrimitiveTypeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure
-	 * @generated
-	 */
-	public PrimitiveTypeFigure getPrimaryShape() {
-		return (PrimitiveTypeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof PrimitiveTypeNameEditPartCN) {
-			((PrimitiveTypeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof PrimitiveTypeNameEditPartCN) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.PrimitiveTypeItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class PrimitiveTypeEditPartCN extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3078;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public PrimitiveTypeEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PrimitiveTypeItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new PrimitiveTypeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.PrimitiveTypeFigure

+	 * 

+	 * @generated

+	 */

+	public PrimitiveTypeFigure getPrimaryShape() {

+		return (PrimitiveTypeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof PrimitiveTypeNameEditPartCN) {

+			((PrimitiveTypeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof PrimitiveTypeNameEditPartCN) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPart.java
index c44a603e001..1f70a73dfcd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5118;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public PrimitiveTypeNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.PrimitiveType_2066, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PrimitiveTypeNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class PrimitiveTypeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5118;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public PrimitiveTypeNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.PrimitiveType_2066, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PrimitiveTypeNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPartCN.java
index 04a252d878c..299be10496f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PrimitiveTypeNameEditPartCN.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5134;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public PrimitiveTypeNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.PrimitiveType_3078, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PrimitiveTypeNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class PrimitiveTypeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5134;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public PrimitiveTypeNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.PrimitiveType_3078, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PrimitiveTypeNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyEditPartCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyEditPartCLN.java
index 0f89cdd67cd..1bcad4bb862 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyEditPartCLN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyEditPartCLN.java
@@ -1,824 +1,817 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.requests.SelectionRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ListItemComponentEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.PropertyItemSemanticEditPolicyCLN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextNonResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class PropertyEditPartCLN extends CompartmentEditPart
-		implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3101;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public PropertyEditPartCLN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public DragTracker getDragTracker(Request request) {
-		if (request instanceof SelectionRequest && ((SelectionRequest) request).getLastButtonPressed() == 3) {
-			return null;
-		}
-		return new DragEditPartsTrackerEx(this);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PropertyItemSemanticEditPolicyCLN());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());
-		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Property_3101, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PropertyEditPartCLN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		if (UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) {
-			refreshUnderline();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new WrappingLabel();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public boolean isSelectable() {
-		return getFigure().isShowing();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.DragTracker;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.requests.SelectionRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ListItemComponentEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.PropertyItemSemanticEditPolicyCLN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextNonResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class PropertyEditPartCLN extends CompartmentEditPart implements ITextAwareEditPart, IPrimaryEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3101;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public PropertyEditPartCLN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public DragTracker getDragTracker(Request request) {

+		if(request instanceof SelectionRequest && ((SelectionRequest)request).getLastButtonPressed() == 3) {

+			return null;

+		}

+		return new DragEditPartsTrackerEx(this);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PropertyItemSemanticEditPolicyCLN());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new UMLTextNonResizableEditPolicy());

+		installEditPolicy(EditPolicy.COMPONENT_ROLE, new ListItemComponentEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Property_3101, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PropertyEditPartCLN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		if(UMLPackage.eINSTANCE.getFeature_IsStatic().equals(feature)) {

+			refreshUnderline();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new WrappingLabel();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public boolean isSelectable() {

+		return getFigure().isShowing();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartCompartmentEditPartCN.java
index 7dd07ac0783..53881fee40a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartCompartmentEditPartCN.java
@@ -1,134 +1,128 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomPropertyPartCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.PropertyPartCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class PropertyPartCompartmentEditPartCN
-		extends ShapeCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7077;
-
-	/**
-	 * @generated
-	 */
-	public PropertyPartCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.PropertyPartCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PropertyPartCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomPropertyPartCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomPropertyPartCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.PropertyPartCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class PropertyPartCompartmentEditPartCN extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7077;

+

+	/**

+	 * @generated

+	 */

+	public PropertyPartCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.PropertyPartCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PropertyPartCompartmentItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomPropertyPartCompartmentItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartEditPartCN.java
index 9038e0e9638..20b7a02d206 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartEditPartCN.java
@@ -1,306 +1,322 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.parts.CustomPropertyPartEditPartCN;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomPropertyPartItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PropertyLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.PropertyPartFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.PropertyPartItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class PropertyPartEditPartCN extends CustomPropertyPartEditPartCN
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3070;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public PropertyPartEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PropertyPartItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomPropertyPartItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new PropertyLayoutEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(ShowHideRelatedContentsEditPolicy.SHOW_HIDE_RELATED_CONTENTS_POLICY, new ShowHideRelatedContentsEditPolicy());
-		installEditPolicy(ShowHideRelatedContentsEditPolicy.SHOW_HIDE_RELATED_CONTENTS_POLICY, new ShowHideRelatedContentsEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				switch (UMLVisualIDRegistry.getVisualID(childView)) {
-				case PortEditPart.VISUAL_ID:
-					return new BorderItemResizableEditPolicy();
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new PropertyPartFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.PropertyPartFigure
-	 * @generated
-	 */
-	public PropertyPartFigure getPrimaryShape() {
-		return (PropertyPartFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof PropertyPartNameEditPartCN) {
-			((PropertyPartNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof PropertyPartCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((PropertyPartCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof PropertyPartNameEditPartCN) {
-			return true;
-		}
-		if (childEditPart instanceof PropertyPartCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((PropertyPartCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof PropertyPartCompartmentEditPartCN) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createMainFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PropertyPartNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideRelatedContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.parts.CustomPropertyPartEditPartCN;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomPropertyPartItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PropertyLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.PropertyPartFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.PropertyPartItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class PropertyPartEditPartCN extends CustomPropertyPartEditPartCN {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3070;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public PropertyPartEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new PropertyPartItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new CustomPropertyPartItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new PropertyLayoutEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(ShowHideRelatedContentsEditPolicy.SHOW_HIDE_RELATED_CONTENTS_POLICY, new ShowHideRelatedContentsEditPolicy());

+		installEditPolicy(ShowHideRelatedContentsEditPolicy.SHOW_HIDE_RELATED_CONTENTS_POLICY, new ShowHideRelatedContentsEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case PortEditPart.VISUAL_ID:

+					return new BorderItemResizableEditPolicy();

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new PropertyPartFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.PropertyPartFigure

+	 * 

+	 * @generated

+	 */

+	public PropertyPartFigure getPrimaryShape() {

+		return (PropertyPartFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof PropertyPartNameEditPartCN) {

+			((PropertyPartNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof PropertyPartCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((PropertyPartCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof PropertyPartNameEditPartCN) {

+			return true;

+		}

+		if(childEditPart instanceof PropertyPartCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((PropertyPartCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof PropertyPartCompartmentEditPartCN) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		if(editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(PropertyPartNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartNameEditPartCN.java
index fcc06212767..2ab618d0706 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/PropertyPartNameEditPartCN.java
@@ -1,823 +1,820 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PropertyLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5126;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public PropertyPartNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new PropertyLabelEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Property_3070, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PropertyPartNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PropertyLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class PropertyPartNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5126;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public PropertyPartNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+		installEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY, new PropertyLabelEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Property_3070, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.PropertyPartNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPart.java
index 53c4d515f33..3088bff6400 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPart.java
@@ -1,132 +1,126 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class ProtocolStateMachineCompositeCompartmentEditPart
-		extends ShapeCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7065;
-
-	/**
-	 * @generated
-	 */
-	public ProtocolStateMachineCompositeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.ProtocolStateMachineCompositeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class ProtocolStateMachineCompositeCompartmentEditPart extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7065;

+

+	/**

+	 * @generated

+	 */

+	public ProtocolStateMachineCompositeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ProtocolStateMachineCompositeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPartCN.java
index 76342a828f5..45dd9d65df1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeCompartmentEditPartCN.java
@@ -1,132 +1,126 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class ProtocolStateMachineCompositeCompartmentEditPartCN
-		extends ShapeCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7052;
-
-	/**
-	 * @generated
-	 */
-	public ProtocolStateMachineCompositeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.ProtocolStateMachineCompositeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class ProtocolStateMachineCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7052;

+

+	/**

+	 * @generated

+	 */

+	public ProtocolStateMachineCompositeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.ProtocolStateMachineCompositeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPart.java
index aae111388cb..08c0280dd48 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPart.java
@@ -1,312 +1,332 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ProtocolStateMachineCompositeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ProtocolStateMachineCompositeItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class ProtocolStateMachineCompositeEditPart extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2062;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ProtocolStateMachineCompositeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ProtocolStateMachineCompositeItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				switch (UMLVisualIDRegistry.getVisualID(childView)) {
-				case PortEditPart.VISUAL_ID:
-				case ParameterEditPart.VISUAL_ID:
-					return new BorderItemResizableEditPolicy();
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new ProtocolStateMachineCompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ProtocolStateMachineCompositeFigure
-	 * @generated
-	 */
-	public ProtocolStateMachineCompositeFigure getPrimaryShape() {
-		return (ProtocolStateMachineCompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ProtocolStateMachineCompositeNameEditPart) {
-			((ProtocolStateMachineCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof ProtocolStateMachineCompositeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((ProtocolStateMachineCompositeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof ParameterEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ProtocolStateMachineCompositeNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof ProtocolStateMachineCompositeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((ProtocolStateMachineCompositeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof ParameterEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof ProtocolStateMachineCompositeCompartmentEditPart) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createMainFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ProtocolStateMachineCompositeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ProtocolStateMachineCompositeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class ProtocolStateMachineCompositeEditPart extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2062;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ProtocolStateMachineCompositeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ProtocolStateMachineCompositeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case PortEditPart.VISUAL_ID:

+				case ParameterEditPart.VISUAL_ID:

+					return new BorderItemResizableEditPolicy();

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new ProtocolStateMachineCompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ProtocolStateMachineCompositeFigure

+	 * 

+	 * @generated

+	 */

+	public ProtocolStateMachineCompositeFigure getPrimaryShape() {

+		return (ProtocolStateMachineCompositeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ProtocolStateMachineCompositeNameEditPart) {

+			((ProtocolStateMachineCompositeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof ProtocolStateMachineCompositeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ProtocolStateMachineCompositeCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof ParameterEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ProtocolStateMachineCompositeNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof ProtocolStateMachineCompositeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((ProtocolStateMachineCompositeCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof ParameterEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof ProtocolStateMachineCompositeCompartmentEditPart) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		if(editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPartCN.java
index 533f5a7325e..587864e0ccc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeEditPartCN.java
@@ -1,312 +1,332 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ProtocolStateMachineCompositeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ProtocolStateMachineCompositeItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class ProtocolStateMachineCompositeEditPartCN extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3074;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public ProtocolStateMachineCompositeEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ProtocolStateMachineCompositeItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				switch (UMLVisualIDRegistry.getVisualID(childView)) {
-				case PortEditPart.VISUAL_ID:
-				case ParameterEditPart.VISUAL_ID:
-					return new BorderItemResizableEditPolicy();
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new ProtocolStateMachineCompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ProtocolStateMachineCompositeFigure
-	 * @generated
-	 */
-	public ProtocolStateMachineCompositeFigure getPrimaryShape() {
-		return (ProtocolStateMachineCompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ProtocolStateMachineCompositeNameEditPartCN) {
-			((ProtocolStateMachineCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof ProtocolStateMachineCompositeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((ProtocolStateMachineCompositeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof ParameterEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof ProtocolStateMachineCompositeNameEditPartCN) {
-			return true;
-		}
-		if (childEditPart instanceof ProtocolStateMachineCompositeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((ProtocolStateMachineCompositeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof ParameterEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof ProtocolStateMachineCompositeCompartmentEditPartCN) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createMainFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.ProtocolStateMachineCompositeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.ProtocolStateMachineCompositeItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class ProtocolStateMachineCompositeEditPartCN extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3074;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public ProtocolStateMachineCompositeEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ProtocolStateMachineCompositeItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case PortEditPart.VISUAL_ID:

+				case ParameterEditPart.VISUAL_ID:

+					return new BorderItemResizableEditPolicy();

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new ProtocolStateMachineCompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.ProtocolStateMachineCompositeFigure

+	 * 

+	 * @generated

+	 */

+	public ProtocolStateMachineCompositeFigure getPrimaryShape() {

+		return (ProtocolStateMachineCompositeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ProtocolStateMachineCompositeNameEditPartCN) {

+			((ProtocolStateMachineCompositeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof ProtocolStateMachineCompositeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((ProtocolStateMachineCompositeCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof ParameterEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof ProtocolStateMachineCompositeNameEditPartCN) {

+			return true;

+		}

+		if(childEditPart instanceof ProtocolStateMachineCompositeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((ProtocolStateMachineCompositeCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof ParameterEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof ProtocolStateMachineCompositeCompartmentEditPartCN) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		if(editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPart.java
index ed0470f4858..57e82fafc4a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5114;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ProtocolStateMachineCompositeNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.ProtocolStateMachine_2062, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ProtocolStateMachineCompositeNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ProtocolStateMachineCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5114;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ProtocolStateMachineCompositeNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.ProtocolStateMachine_2062, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ProtocolStateMachineCompositeNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPartCN.java
index d7e5907b9ba..7c63482a804 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeNameEditPartCN.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5130;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public ProtocolStateMachineCompositeNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.ProtocolStateMachine_3074, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ProtocolStateMachineCompositeNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class ProtocolStateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5130;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public ProtocolStateMachineCompositeNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.ProtocolStateMachine_3074, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.ProtocolStateMachineCompositeNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationAppliedStereotypeEditPart.java
index 53ba49cb672..a181e6e30cd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationAppliedStereotypeEditPart.java
@@ -1,759 +1,752 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6018;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));
-	}
-
-	/**
-	 * @generated
-	 */
-	public RealizationAppliedStereotypeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Realization_4006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationAppliedStereotypeEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		// The label is read-only (defined in GMFGen model)
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class RealizationAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6018;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));

+	}

+

+	/**

+	 * @generated

+	 */

+	public RealizationAppliedStereotypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Realization_4006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationAppliedStereotypeEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		// The label is read-only (defined in GMFGen model)

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationEditPart.java
index 05aaa1ca1ea..23b7c87c4fb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationEditPart.java
@@ -1,119 +1,114 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.RealizationItemSemanticEditPolicy;
-
-/**
- * @generated
- */
-public class RealizationEditPart extends UMLConnectionNodeEditPart
-		implements ITreeBranchEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4006;
-
-	/**
-	 * @generated
-	 */
-	public RealizationEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new RealizationItemSemanticEditPolicy());
-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof RealizationNameEditPart) {
-			((RealizationNameEditPart) childEditPart).setLabel(
-					getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof RealizationAppliedStereotypeEditPart) {
-			((RealizationAppliedStereotypeEditPart) childEditPart).setLabel(
-					getPrimaryShape().getAppliedStereotypeLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof RealizationNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof RealizationAppliedStereotypeEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected Connection createConnectionFigure() {
-		return new InterfaceRealizationFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	public InterfaceRealizationFigure getPrimaryShape() {
-		return (InterfaceRealizationFigure) getFigure();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.RealizationItemSemanticEditPolicy;

+

+/**

+ * @generated

+ */

+public class RealizationEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 4006;

+

+	/**

+	 * @generated

+	 */

+	public RealizationEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new RealizationItemSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof RealizationNameEditPart) {

+			((RealizationNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		}

+		if(childEditPart instanceof RealizationAppliedStereotypeEditPart) {

+			((RealizationAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof RealizationNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof RealizationAppliedStereotypeEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected Connection createConnectionFigure() {

+		return new InterfaceRealizationFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public InterfaceRealizationFigure getPrimaryShape() {

+		return (InterfaceRealizationFigure)getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationNameEditPart.java
index b39bc3247a5..f8e4dbc00d8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RealizationNameEditPart.java
@@ -1,766 +1,760 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6004;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationNameEditPart.VISUAL_ID), new Point(0, 60));
-	}
-
-	/**
-	 * @generated
-	 */
-	public RealizationNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Realization_4006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class RealizationNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6004;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationNameEditPart.VISUAL_ID), new Point(0, 60));

+	}

+

+	/**

+	 * @generated

+	 */

+	public RealizationNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Realization_4006, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationEditPart.java
index 83fba544400..a10e78eada1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationEditPart.java
@@ -1,109 +1,106 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.RepresentationFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.RepresentationItemSemanticEditPolicy;
-
-/**
- * @generated
- */
-public class RepresentationEditPart extends UMLConnectionNodeEditPart
-		implements ITreeBranchEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4020;
-
-	/**
-	 * @generated
-	 */
-	public RepresentationEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new RepresentationItemSemanticEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof RepresentationTagLabelEditPart) {
-			((RepresentationTagLabelEditPart) childEditPart).setLabel(
-					getPrimaryShape().getTagLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof RepresentationTagLabelEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected Connection createConnectionFigure() {
-		return new RepresentationFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	public RepresentationFigure getPrimaryShape() {
-		return (RepresentationFigure) getFigure();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.RepresentationFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.RepresentationItemSemanticEditPolicy;

+

+/**

+ * @generated

+ */

+public class RepresentationEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 4020;

+

+	/**

+	 * @generated

+	 */

+	public RepresentationEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new RepresentationItemSemanticEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof RepresentationTagLabelEditPart) {

+			((RepresentationTagLabelEditPart)childEditPart).setLabel(getPrimaryShape().getTagLabel());

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof RepresentationTagLabelEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected Connection createConnectionFigure() {

+		return new RepresentationFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public RepresentationFigure getPrimaryShape() {

+		return (RepresentationFigure)getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationTagLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationTagLabelEditPart.java
index 279d18033dd..6a7d5ef35c1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationTagLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RepresentationTagLabelEditPart.java
@@ -1,767 +1,761 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6030;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationTagLabelEditPart.VISUAL_ID), new Point(0, 15));
-	}
-
-	/**
-	 * @generated
-	 */
-	public RepresentationTagLabelEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		EObject element = resolveSemanticElement();
-		return element != null ? element : (View) getModel();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.InformationItemRepresented_4020, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationTagLabelEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class RepresentationTagLabelEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6030;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationTagLabelEditPart.VISUAL_ID), new Point(0, 15));

+	}

+

+	/**

+	 * @generated

+	 */

+	public RepresentationTagLabelEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		EObject element = resolveSemanticElement();

+		return element != null ? element : (View)getModel();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.InformationItemRepresented_4020, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationTagLabelEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingAppliedStereotypeEditPart.java
index 322841663be..21325a07131 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingAppliedStereotypeEditPart.java
@@ -1,759 +1,752 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6028;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));
-	}
-
-	/**
-	 * @generated
-	 */
-	public RoleBindingAppliedStereotypeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingAppliedStereotypeEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		// The label is read-only (defined in GMFGen model)
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class RoleBindingAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6028;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 60));

+	}

+

+	/**

+	 * @generated

+	 */

+	public RoleBindingAppliedStereotypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingAppliedStereotypeEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		// The label is read-only (defined in GMFGen model)

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingEditPart.java
index 218d11c15f3..3d8173c89e2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingEditPart.java
@@ -1,119 +1,114 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.RoleBindingFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.RoleBindingItemSemanticEditPolicy;
-
-/**
- * @generated
- */
-public class RoleBindingEditPart extends UMLConnectionNodeEditPart
-		implements ITreeBranchEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4017;
-
-	/**
-	 * @generated
-	 */
-	public RoleBindingEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new RoleBindingItemSemanticEditPolicy());
-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof RoleBindingRoleNameEditPart) {
-			((RoleBindingRoleNameEditPart) childEditPart).setLabel(
-					getPrimaryShape().getRoleLabel());
-			return true;
-		}
-		if (childEditPart instanceof RoleBindingAppliedStereotypeEditPart) {
-			((RoleBindingAppliedStereotypeEditPart) childEditPart).setLabel(
-					getPrimaryShape().getAppliedStereotypeLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof RoleBindingRoleNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof RoleBindingAppliedStereotypeEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected Connection createConnectionFigure() {
-		return new RoleBindingFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	public RoleBindingFigure getPrimaryShape() {
-		return (RoleBindingFigure) getFigure();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.RoleBindingFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.RoleBindingItemSemanticEditPolicy;

+

+/**

+ * @generated

+ */

+public class RoleBindingEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 4017;

+

+	/**

+	 * @generated

+	 */

+	public RoleBindingEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new RoleBindingItemSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeLinkLabelDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof RoleBindingRoleNameEditPart) {

+			((RoleBindingRoleNameEditPart)childEditPart).setLabel(getPrimaryShape().getRoleLabel());

+		}

+		if(childEditPart instanceof RoleBindingAppliedStereotypeEditPart) {

+			((RoleBindingAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof RoleBindingRoleNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof RoleBindingAppliedStereotypeEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected Connection createConnectionFigure() {

+		return new RoleBindingFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public RoleBindingFigure getPrimaryShape() {

+		return (RoleBindingFigure)getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingRoleNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingRoleNameEditPart.java
index 07ab4bc70a6..b5bda93b393 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingRoleNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/RoleBindingRoleNameEditPart.java
@@ -1,759 +1,752 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6027;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingRoleNameEditPart.VISUAL_ID), new Point(0, 20));
-	}
-
-	/**
-	 * @generated
-	 */
-	public RoleBindingRoleNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.SOURCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingRoleNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		// The label is read-only (defined in GMFGen model)
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class RoleBindingRoleNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6027;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingRoleNameEditPart.VISUAL_ID), new Point(0, 20));

+	}

+

+	/**

+	 * @generated

+	 */

+	public RoleBindingRoleNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.SOURCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Dependency_4017, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingRoleNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		// The label is read-only (defined in GMFGen model)

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPart.java
index f08e4dd1623..8bcfe16ba65 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPart.java
@@ -1,248 +1,259 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.SignalFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.SignalItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class SignalEditPart extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2081;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public SignalEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new SignalItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new SignalFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.SignalFigure
-	 * @generated
-	 */
-	public SignalFigure getPrimaryShape() {
-		return (SignalFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof SignalNameEditPart) {
-			((SignalNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof SignalNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(SignalNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.SignalFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.SignalItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class SignalEditPart extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2081;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SignalEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new SignalItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new SignalFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.SignalFigure

+	 * 

+	 * @generated

+	 */

+	public SignalFigure getPrimaryShape() {

+		return (SignalFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof SignalNameEditPart) {

+			((SignalNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof SignalNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(SignalNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPartCN.java
index 2343c3dc453..fdde655c88e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEditPartCN.java
@@ -1,248 +1,259 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.SignalFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.SignalItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class SignalEditPartCN extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3095;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public SignalEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new SignalItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new SignalFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.SignalFigure
-	 * @generated
-	 */
-	public SignalFigure getPrimaryShape() {
-		return (SignalFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof SignalNameEditPartCN) {
-			((SignalNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof SignalNameEditPartCN) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(SignalNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.SignalFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.SignalItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class SignalEditPartCN extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3095;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SignalEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new SignalItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new SignalFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.SignalFigure

+	 * 

+	 * @generated

+	 */

+	public SignalFigure getPrimaryShape() {

+		return (SignalFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof SignalNameEditPartCN) {

+			((SignalNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof SignalNameEditPartCN) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(SignalNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventEditPart.java
index 9b58497c0e3..1efdb476f22 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventEditPart.java
@@ -1,239 +1,248 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.SignalEventItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class SignalEventEditPart extends NodeEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2083;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public SignalEventEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new SignalEventItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeNamedElementFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 * @generated
-	 */
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof SignalEventNameEditPart) {
-			((SignalEventNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof SignalEventNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(SignalEventNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.SignalEventItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class SignalEventEditPart extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2083;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public SignalEventEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new SignalEventItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeNamedElementFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 * 

+	 * @generated

+	 */

+	public NodeNamedElementFigure getPrimaryShape() {

+		return (NodeNamedElementFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof SignalEventNameEditPart) {

+			((SignalEventNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof SignalEventNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(SignalEventNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventNameEditPart.java
index 7c71bb9d5a4..f918a2d54f3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalEventNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5166;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public SignalEventNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.SignalEvent_2083, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SignalEventNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class SignalEventNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5166;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public SignalEventNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.SignalEvent_2083, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SignalEventNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPart.java
index 3f82e3efcab..525d4e9eb78 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class SignalNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5164;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public SignalNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Signal_2081, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SignalNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class SignalNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5164;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public SignalNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Signal_2081, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SignalNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPartCN.java
index fd042886e2f..b80eef2f0c7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SignalNameEditPartCN.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5148;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public SignalNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Signal_3095, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SignalNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class SignalNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5148;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public SignalNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Signal_3095, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SignalNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPart.java
index 936cead656a..84c78fd3f62 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPart.java
@@ -1,132 +1,126 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.StateMachineCompositeCompartmentItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class StateMachineCompositeCompartmentEditPart
-		extends ShapeCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7066;
-
-	/**
-	 * @generated
-	 */
-	public StateMachineCompositeCompartmentEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.StateMachineCompositeCompartmentEditPart_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new StateMachineCompositeCompartmentItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.StateMachineCompositeCompartmentItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class StateMachineCompositeCompartmentEditPart extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7066;

+

+	/**

+	 * @generated

+	 */

+	public StateMachineCompositeCompartmentEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.StateMachineCompositeCompartmentEditPart_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new StateMachineCompositeCompartmentItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPartCN.java
index 9692af59b71..d131ad03f6d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeCompartmentEditPartCN.java
@@ -1,132 +1,126 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.StateMachineCompositeCompartmentItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-
-/**
- * @generated
- */
-public class StateMachineCompositeCompartmentEditPartCN
-		extends ShapeCompartmentEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 7053;
-
-	/**
-	 * @generated
-	 */
-	public StateMachineCompositeCompartmentEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getCompartmentName() {
-		return Messages.StateMachineCompositeCompartmentEditPartCN_title;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new StateMachineCompositeCompartmentItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setRatio(Double ratio) {
-		if (getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getTargetEditPart(Request request) {
-		return super.getTargetEditPart(request);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification notification) {
-		Object feature = notification.getFeature();
-		if (NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-				|| NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-				|| NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-			refreshBounds();
-		}
-		super.handleNotificationEvent(notification);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshBounds() {
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		Dimension size = new Dimension(width, height);
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		Point loc = new Point(x, y);
-		((GraphicalEditPart) getParent()).setLayoutConstraint(
-				this,
-				getFigure(),
-				new Rectangle(loc, size));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshBounds();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.CustomContainerEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.PortInCompartmentCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.StateMachineCompositeCompartmentItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+

+/**

+ * @generated

+ */

+public class StateMachineCompositeCompartmentEditPartCN extends ShapeCompartmentEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 7053;

+

+	/**

+	 * @generated

+	 */

+	public StateMachineCompositeCompartmentEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getCompartmentName() {

+		return Messages.StateMachineCompositeCompartmentEditPartCN_title;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new ResizableCompartmentEditPolicy());

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new StateMachineCompositeCompartmentItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(DuplicatePasteEditPolicy.PASTE_ROLE, new DuplicatePasteEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomContainerEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PortInCompartmentCreationEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setRatio(Double ratio) {

+		if(getFigure().getParent().getLayoutManager() instanceof ConstrainedToolbarLayout) {

+			super.setRatio(ratio);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getTargetEditPart(Request request) {

+

+		return super.getTargetEditPart(request);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification notification) {

+		Object feature = notification.getFeature();

+		if(NotationPackage.eINSTANCE.getSize_Width().equals(feature) || NotationPackage.eINSTANCE.getSize_Height().equals(feature) || NotationPackage.eINSTANCE.getLocation_X().equals(feature) || NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {

+			refreshBounds();

+		}

+		super.handleNotificationEvent(notification);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshBounds() {

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		Dimension size = new Dimension(width, height);

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		Point loc = new Point(x, y);

+		((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), new Rectangle(loc, size));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshBounds();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPart.java
index 3aca02e0ea6..7f2a0c64b86 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPart.java
@@ -1,312 +1,332 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.StateMachineCompositeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.StateMachineCompositeItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class StateMachineCompositeEditPart extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2063;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public StateMachineCompositeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new StateMachineCompositeItemSemanticEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				switch (UMLVisualIDRegistry.getVisualID(childView)) {
-				case PortEditPart.VISUAL_ID:
-				case ParameterEditPart.VISUAL_ID:
-					return new BorderItemResizableEditPolicy();
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new StateMachineCompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.StateMachineCompositeFigure
-	 * @generated
-	 */
-	public StateMachineCompositeFigure getPrimaryShape() {
-		return (StateMachineCompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof StateMachineCompositeNameEditPart) {
-			((StateMachineCompositeNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof StateMachineCompositeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((StateMachineCompositeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof ParameterEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof StateMachineCompositeNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof StateMachineCompositeCompartmentEditPart) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((StateMachineCompositeCompartmentEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof ParameterEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof StateMachineCompositeCompartmentEditPart) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createMainFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(StateMachineCompositeNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.StateMachineCompositeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.StateMachineCompositeItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class StateMachineCompositeEditPart extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2063;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public StateMachineCompositeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new StateMachineCompositeItemSemanticEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case PortEditPart.VISUAL_ID:

+				case ParameterEditPart.VISUAL_ID:

+					return new BorderItemResizableEditPolicy();

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new StateMachineCompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.StateMachineCompositeFigure

+	 * 

+	 * @generated

+	 */

+	public StateMachineCompositeFigure getPrimaryShape() {

+		return (StateMachineCompositeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof StateMachineCompositeNameEditPart) {

+			((StateMachineCompositeNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof StateMachineCompositeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((StateMachineCompositeCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof ParameterEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof StateMachineCompositeNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof StateMachineCompositeCompartmentEditPart) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((StateMachineCompositeCompartmentEditPart)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof ParameterEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof StateMachineCompositeCompartmentEditPart) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		if(editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(StateMachineCompositeNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPartCN.java
index 6e1238ffea5..36504fcb40f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeEditPartCN.java
@@ -1,312 +1,332 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.StateMachineCompositeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.StateMachineCompositeItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class StateMachineCompositeEditPartCN extends NamedElementEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3075;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public StateMachineCompositeEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new StateMachineCompositeItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());
-		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());
-		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());
-		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());
-		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				switch (UMLVisualIDRegistry.getVisualID(childView)) {
-				case PortEditPart.VISUAL_ID:
-				case ParameterEditPart.VISUAL_ID:
-					return new BorderItemResizableEditPolicy();
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new StateMachineCompositeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.StateMachineCompositeFigure
-	 * @generated
-	 */
-	public StateMachineCompositeFigure getPrimaryShape() {
-		return (StateMachineCompositeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof StateMachineCompositeNameEditPartCN) {
-			((StateMachineCompositeNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof StateMachineCompositeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((StateMachineCompositeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof PortEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((PortEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		//Papyrus Gencode :Affixed Port locator
-		if (childEditPart instanceof ParameterEditPart) {
-			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);
-			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart) childEditPart).getFigure(), locator);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof StateMachineCompositeNameEditPartCN) {
-			return true;
-		}
-		if (childEditPart instanceof StateMachineCompositeCompartmentEditPartCN) {
-			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();
-			pane.remove(((StateMachineCompositeCompartmentEditPartCN) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof PortEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart) childEditPart).getFigure());
-			return true;
-		}
-		if (childEditPart instanceof ParameterEditPart) {
-			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart) childEditPart).getFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		if (editPart instanceof StateMachineCompositeCompartmentEditPartCN) {
-			return getPrimaryShape().getCompositeCompartmentFigure();
-		}
-		if (editPart instanceof IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createMainFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(StateMachineCompositeNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.PositionConstants;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.NamedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AffixedNodeAlignmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.BorderItemResizableEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideClassifierContentsEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideCompartmentEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.BehaviorLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.RemoveOrphanViewPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.StateMachineCompositeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.locators.PortPositionLocator;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.StateMachineCompositeItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class StateMachineCompositeEditPartCN extends NamedElementEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3075;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public StateMachineCompositeEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		installEditPolicy(EditPolicyRoles.CREATION_ROLE, new PapyrusCreationEditPolicy());

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new StateMachineCompositeItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new DragDropEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new BehaviorLayoutEditPolicy());

+		installEditPolicy(ShowHideClassifierContentsEditPolicy.SHOW_HIDE_CLASSIFIER_CONTENTS_POLICY, new ShowHideClassifierContentsEditPolicy());

+		installEditPolicy(ShowHideCompartmentEditPolicy.SHOW_HIDE_COMPARTMENT_POLICY, new ShowHideCompartmentEditPolicy());

+		installEditPolicy(AffixedNodeAlignmentEditPolicy.AFFIXED_CHILD_ALIGNMENT_ROLE, new AffixedNodeAlignmentEditPolicy());

+		installEditPolicy("REMOVE_ORPHAN_VIEW", new RemoveOrphanViewPolicy()); //$NON-NLS-1$

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case PortEditPart.VISUAL_ID:

+				case ParameterEditPart.VISUAL_ID:

+					return new BorderItemResizableEditPolicy();

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new StateMachineCompositeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.StateMachineCompositeFigure

+	 * 

+	 * @generated

+	 */

+	public StateMachineCompositeFigure getPrimaryShape() {

+		return (StateMachineCompositeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof StateMachineCompositeNameEditPartCN) {

+			((StateMachineCompositeNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		if(childEditPart instanceof StateMachineCompositeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 

+			pane.add(((StateMachineCompositeCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof PortEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((PortEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+

+

+		//Papyrus Gencode :Affixed Port locator

+		if(childEditPart instanceof ParameterEditPart) {

+			IBorderItemLocator locator = new PortPositionLocator(getMainFigure(), PositionConstants.NONE);

+			getBorderedFigure().getBorderItemContainer().add(((ParameterEditPart)childEditPart).getFigure(), locator);

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof StateMachineCompositeNameEditPartCN) {

+			return true;

+		}

+		if(childEditPart instanceof StateMachineCompositeCompartmentEditPartCN) {

+			IFigure pane = getPrimaryShape().getCompositeCompartmentFigure();

+			pane.remove(((StateMachineCompositeCompartmentEditPartCN)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof PortEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((PortEditPart)childEditPart).getFigure());

+			return true;

+		}

+		if(childEditPart instanceof ParameterEditPart) {

+			getBorderedFigure().getBorderItemContainer().remove(((ParameterEditPart)childEditPart).getFigure());

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		if(editPart instanceof StateMachineCompositeCompartmentEditPartCN) {

+			return getPrimaryShape().getCompositeCompartmentFigure();

+		}

+		if(editPart instanceof IBorderItemEditPart) {

+			return getBorderedFigure().getBorderItemContainer();

+		}

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(StateMachineCompositeNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPart.java
index 18457afc597..2caec83b22b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5115;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public StateMachineCompositeNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.StateMachine_2063, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.StateMachineCompositeNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class StateMachineCompositeNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5115;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public StateMachineCompositeNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.StateMachine_2063, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.StateMachineCompositeNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPartCN.java
index e7d4cf24c45..72e5aa43e39 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StateMachineCompositeNameEditPartCN.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5131;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public StateMachineCompositeNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.StateMachine_3075, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.StateMachineCompositeNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class StateMachineCompositeNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5131;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public StateMachineCompositeNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.StateMachine_3075, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.StateMachineCompositeNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionEditPart.java
index 1311ee8c375..6b603f98771 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionEditPart.java
@@ -1,239 +1,248 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.StringExpressionItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class StringExpressionEditPart extends NodeEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2100;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public StringExpressionEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new StringExpressionItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeNamedElementFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 * @generated
-	 */
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof StringExpressionNameEditPart) {
-			((StringExpressionNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof StringExpressionNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(StringExpressionNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.StringExpressionItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class StringExpressionEditPart extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2100;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public StringExpressionEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new StringExpressionItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeNamedElementFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 * 

+	 * @generated

+	 */

+	public NodeNamedElementFigure getPrimaryShape() {

+		return (NodeNamedElementFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof StringExpressionNameEditPart) {

+			((StringExpressionNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof StringExpressionNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(StringExpressionNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionNameEditPart.java
index d00cc6e23f6..10f3fc73f73 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/StringExpressionNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5183;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public StringExpressionNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.StringExpression_2100, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.StringExpressionNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class StringExpressionNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5183;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public StringExpressionNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.StringExpression_2100, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.StringExpressionNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionAppliedStereotypeEditPart.java
index b8aeaa3e076..73e11d5b4ac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionAppliedStereotypeEditPart.java
@@ -1,759 +1,752 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6017;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));
-	}
-
-	/**
-	 * @generated
-	 */
-	public SubstitutionAppliedStereotypeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Substitution_4011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionAppliedStereotypeEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		// The label is read-only (defined in GMFGen model)
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class SubstitutionAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6017;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));

+	}

+

+	/**

+	 * @generated

+	 */

+	public SubstitutionAppliedStereotypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Substitution_4011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionAppliedStereotypeEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		// The label is read-only (defined in GMFGen model)

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionEditPart.java
index cd0524604cc..6faa86402dc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionEditPart.java
@@ -1,120 +1,115 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeSubstitutionLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.SubstitutionItemSemanticEditPolicy;
-
-/**
- * @generated
- */
-public class SubstitutionEditPart extends UMLConnectionNodeEditPart
-		implements ITreeBranchEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4011;
-
-	/**
-	 * @generated
-	 */
-	public SubstitutionEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new SubstitutionItemSemanticEditPolicy());
-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeSubstitutionLabelDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof SubstitutionNameEditPart) {
-			((SubstitutionNameEditPart) childEditPart).setLabel(
-					getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof SubstitutionAppliedStereotypeEditPart) {
-			((SubstitutionAppliedStereotypeEditPart) childEditPart).setLabel(
-					getPrimaryShape().getAppliedStereotypeLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof SubstitutionNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof SubstitutionAppliedStereotypeEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected Connection createConnectionFigure() {
-		return new InterfaceRealizationFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	public InterfaceRealizationFigure getPrimaryShape() {
-		return (InterfaceRealizationFigure) getFigure();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeSubstitutionLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.InterfaceRealizationFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.SubstitutionItemSemanticEditPolicy;

+

+/**

+ * @generated

+ */

+public class SubstitutionEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 4011;

+

+	/**

+	 * @generated

+	 */

+	public SubstitutionEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new SubstitutionItemSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeSubstitutionLabelDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof SubstitutionNameEditPart) {

+			((SubstitutionNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		}

+		if(childEditPart instanceof SubstitutionAppliedStereotypeEditPart) {

+			((SubstitutionAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof SubstitutionNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof SubstitutionAppliedStereotypeEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected Connection createConnectionFigure() {

+		return new InterfaceRealizationFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public InterfaceRealizationFigure getPrimaryShape() {

+		return (InterfaceRealizationFigure)getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionNameEditPart.java
index a6fd2854d01..723c99d9e36 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/SubstitutionNameEditPart.java
@@ -1,766 +1,760 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6003;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionNameEditPart.VISUAL_ID), new Point(0, 60));
-	}
-
-	/**
-	 * @generated
-	 */
-	public SubstitutionNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Substitution_4011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class SubstitutionNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6003;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionNameEditPart.VISUAL_ID), new Point(0, 60));

+	}

+

+	/**

+	 * @generated

+	 */

+	public SubstitutionNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Substitution_4011, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPart.java
index 2b870e08ba9..4c6ffa9f106 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPart.java
@@ -1,253 +1,264 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.TimeConstraintItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class TimeConstraintEditPart extends AbstractConstraintEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2111;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public TimeConstraintEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new TimeConstraintItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new ConstraintFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure
-	 * @generated
-	 */
-	public ConstraintFigure getPrimaryShape() {
-		return (ConstraintFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof TimeConstraintNameEditPart) {
-			((TimeConstraintNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof TimeConstraintSpecificationEditPart) {
-			((TimeConstraintSpecificationEditPart) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof TimeConstraintNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof TimeConstraintSpecificationEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(TimeConstraintNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.TimeConstraintItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class TimeConstraintEditPart extends AbstractConstraintEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2111;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public TimeConstraintEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new TimeConstraintItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new ConstraintFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure

+	 * 

+	 * @generated

+	 */

+	public ConstraintFigure getPrimaryShape() {

+		return (ConstraintFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof TimeConstraintNameEditPart) {

+			((TimeConstraintNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+		if(childEditPart instanceof TimeConstraintSpecificationEditPart) {

+			((TimeConstraintSpecificationEditPart)childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof TimeConstraintNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof TimeConstraintSpecificationEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(TimeConstraintNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPartCN.java
index 6174dc1b379..9dd87cd1495 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintEditPartCN.java
@@ -1,253 +1,264 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.TimeConstraintItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class TimeConstraintEditPartCN extends AbstractConstraintEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3117;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public TimeConstraintEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new TimeConstraintItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new ConstraintFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure
-	 * @generated
-	 */
-	public ConstraintFigure getPrimaryShape() {
-		return (ConstraintFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof TimeConstraintNameEditPartCN) {
-			((TimeConstraintNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof TimeConstraintSpecificationEditPartCN) {
-			((TimeConstraintSpecificationEditPartCN) childEditPart).setLabel(getPrimaryShape().getConstraintFigure());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof TimeConstraintNameEditPartCN) {
-			return true;
-		}
-		if (childEditPart instanceof TimeConstraintSpecificationEditPartCN) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(TimeConstraintNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractConstraintEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.TimeConstraintItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class TimeConstraintEditPartCN extends AbstractConstraintEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3117;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public TimeConstraintEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new TimeConstraintItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new ConstraintFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.ConstraintFigure

+	 * 

+	 * @generated

+	 */

+	public ConstraintFigure getPrimaryShape() {

+		return (ConstraintFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof TimeConstraintNameEditPartCN) {

+			((TimeConstraintNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+		if(childEditPart instanceof TimeConstraintSpecificationEditPartCN) {

+			((TimeConstraintSpecificationEditPartCN)childEditPart).setLabel(getPrimaryShape().getConstraintFigure());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof TimeConstraintNameEditPartCN) {

+			return true;

+		}

+		if(childEditPart instanceof TimeConstraintSpecificationEditPartCN) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(TimeConstraintNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPart.java
index c858dfae6d1..5a8b05aeb51 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5194;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public TimeConstraintNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.TimeConstraint_2111, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeConstraintNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class TimeConstraintNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5194;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public TimeConstraintNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.TimeConstraint_2111, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeConstraintNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPartCN.java
index bbb4bf20fe4..63fbafce985 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintNameEditPartCN.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6042;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public TimeConstraintNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.TimeConstraint_3117, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeConstraintNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class TimeConstraintNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6042;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public TimeConstraintNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.TimeConstraint_3117, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeConstraintNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPart.java
index 119458dc4ba..10510f23592 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPart.java
@@ -1,804 +1,801 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6036;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public TimeConstraintSpecificationEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.TimeConstraint_2111, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeConstraintSpecificationEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class TimeConstraintSpecificationEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6036;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public TimeConstraintSpecificationEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.TimeConstraint_2111, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeConstraintSpecificationEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPartCN.java
index 63eaef7af89..d182d38c235 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeConstraintSpecificationEditPartCN.java
@@ -1,804 +1,801 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6043;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public TimeConstraintSpecificationEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.TimeConstraint_3117, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeConstraintSpecificationEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class TimeConstraintSpecificationEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6043;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public TimeConstraintSpecificationEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.TimeConstraint_3117, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeConstraintSpecificationEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventEditPart.java
index ecfea486b43..661b53b92fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventEditPart.java
@@ -1,239 +1,248 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.TimeEventItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class TimeEventEditPart extends NodeEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2089;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public TimeEventEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new TimeEventItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeNamedElementFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 * @generated
-	 */
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof TimeEventNameEditPart) {
-			((TimeEventNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof TimeEventNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(TimeEventNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.TimeEventItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class TimeEventEditPart extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2089;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public TimeEventEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new TimeEventItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeNamedElementFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 * 

+	 * @generated

+	 */

+	public NodeNamedElementFigure getPrimaryShape() {

+		return (NodeNamedElementFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof TimeEventNameEditPart) {

+			((TimeEventNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof TimeEventNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(TimeEventNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventNameEditPart.java
index fb18336ca4c..f1cb00b46a9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeEventNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5172;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public TimeEventNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.TimeEvent_2089, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeEventNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class TimeEventNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5172;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public TimeEventNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.TimeEvent_2089, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeEventNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionEditPart.java
index baf9100b776..cfcf52c4882 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionEditPart.java
@@ -1,239 +1,248 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.TimeExpressionItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class TimeExpressionEditPart extends NodeEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2102;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public TimeExpressionEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new TimeExpressionItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeNamedElementFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 * @generated
-	 */
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof TimeExpressionNameEditPart) {
-			((TimeExpressionNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof TimeExpressionNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(TimeExpressionNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.TimeExpressionItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class TimeExpressionEditPart extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2102;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public TimeExpressionEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new TimeExpressionItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeNamedElementFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 * 

+	 * @generated

+	 */

+	public NodeNamedElementFigure getPrimaryShape() {

+		return (NodeNamedElementFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof TimeExpressionNameEditPart) {

+			((TimeExpressionNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof TimeExpressionNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(TimeExpressionNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionNameEditPart.java
index aed779e1573..c1146d87152 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeExpressionNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5185;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public TimeExpressionNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.TimeExpression_2102, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeExpressionNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class TimeExpressionNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5185;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public TimeExpressionNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.TimeExpression_2102, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeExpressionNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalEditPart.java
index 1d7410f797e..ea21cdd4b52 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalEditPart.java
@@ -1,239 +1,248 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.TimeIntervalItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class TimeIntervalEditPart extends NodeEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2105;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public TimeIntervalEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new TimeIntervalItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeNamedElementFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 * @generated
-	 */
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof TimeIntervalNameEditPart) {
-			((TimeIntervalNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof TimeIntervalNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(TimeIntervalNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.TimeIntervalItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class TimeIntervalEditPart extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2105;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public TimeIntervalEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new TimeIntervalItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeNamedElementFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 * 

+	 * @generated

+	 */

+	public NodeNamedElementFigure getPrimaryShape() {

+		return (NodeNamedElementFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof TimeIntervalNameEditPart) {

+			((TimeIntervalNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof TimeIntervalNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(TimeIntervalNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalNameEditPart.java
index 8bf407114af..667145a582f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeIntervalNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5188;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public TimeIntervalNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.TimeInterval_2105, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeIntervalNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class TimeIntervalNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5188;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public TimeIntervalNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.TimeInterval_2105, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeIntervalNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEditPart.java
index a4e3a167eb6..72bac153eae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEditPart.java
@@ -1,252 +1,260 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.handles.MoveHandle;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.parts.AbstractObservationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.ObservationLayoutEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.custom.figures.TimeObservationNodeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.TimeObservationItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class TimeObservationEditPart extends AbstractObservationEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2094;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public TimeObservationEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new TimeObservationItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeIconlDisplayEditPolicy());
-		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, new ObservationLayoutEditPolicy());
-		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				View childView = (View) child.getModel();
-				switch (UMLVisualIDRegistry.getVisualID(childView)) {
-				case TimeObservationNameEditPart.VISUAL_ID:
-				case TimeObservationStereotypeLabelEditPart.VISUAL_ID:
-					return new BorderItemSelectionEditPolicy() {
-						protected List<?> createSelectionHandles() {
-							MoveHandle mh = new MoveHandle((GraphicalEditPart) getHost());
-							mh.setBorder(null);
-							return Collections.singletonList(mh);
-						}
-					}
-					;
-				}
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 *Papyrus codeGen
-	 *@generated
-	 **/
-	protected void handleNotificationEvent(Notification event) {
-		/*
-		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart
-		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!
-		 */
-		if (NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {
-			Object notifier = event.getNotifier();
-			List<?> modelChildren = ((View) getModel()).getChildren();
-			if (!(notifier instanceof Edge)) {
-				if (modelChildren.contains(event.getNotifier())) {
-					return;
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new TimeObservationNodeFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.TimeObservationNodeFigure
-	 * @generated
-	 */
-	public TimeObservationNodeFigure getPrimaryShape() {
-		return (TimeObservationNodeFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {
-		if (borderItemEditPart instanceof TimeObservationNameEditPart) {
-			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());
-			borderItemContainer.add(borderItemEditPart.getFigure(), locator);
-		} else if (borderItemEditPart instanceof TimeObservationStereotypeLabelEditPart) {
-			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());
-			borderItemContainer.add(borderItemEditPart.getFigure(), locator);
-		} else
-		{
-			super.addBorderItem(borderItemContainer, borderItemEditPart);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createMainFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(TimeObservationNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeIconlDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.ShowHideLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.locator.ExternalLabelPositionLocator;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.parts.AbstractObservationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomDiagramDragDropEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.ObservationLayoutEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.custom.figures.TimeObservationNodeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.TimeObservationItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class TimeObservationEditPart extends AbstractObservationEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2094;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public TimeObservationEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new TimeObservationItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeIconlDisplayEditPolicy());

+		installEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new CustomDiagramDragDropEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, new ObservationLayoutEditPolicy());

+		installEditPolicy(ShowHideLabelEditPolicy.SHOW_HIDE_LABEL_ROLE, new ShowHideLabelEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				View childView = (View)child.getModel();

+				switch(UMLVisualIDRegistry.getVisualID(childView)) {

+				case TimeObservationNameEditPart.VISUAL_ID:

+				case TimeObservationStereotypeLabelEditPart.VISUAL_ID:

+					return new BorderItemSelectionEditPolicy() {

+

+						protected List<?> createSelectionHandles() {

+							MoveHandle mh = new MoveHandle((GraphicalEditPart)getHost());

+							mh.setBorder(null);

+							return Collections.singletonList(mh);

+						}

+					};

+				}

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * Papyrus codeGen

+	 *

+	 * @generated

+	 **/

+	protected void handleNotificationEvent(Notification event) {

+		/*

+		 * when a node have external node labels, the methods refreshChildren() remove the EditPart corresponding to the Label from the EditPart

+		 * Registry. After that, we can't reset the visibility to true (using the Show/Hide Label Action)!

+		 */

+		if(NotationPackage.eINSTANCE.getView_Visible().equals(event.getFeature())) {

+			Object notifier = event.getNotifier();

+			List<?> modelChildren = ((View)getModel()).getChildren();

+			if(!(notifier instanceof Edge)) {

+				if(modelChildren.contains(event.getNotifier())) {

+					return;

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new TimeObservationNodeFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.composite.custom.figures.TimeObservationNodeFigure

+	 * 

+	 * @generated

+	 */

+	public TimeObservationNodeFigure getPrimaryShape() {

+		return (TimeObservationNodeFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addBorderItem(IFigure borderItemContainer, IBorderItemEditPart borderItemEditPart) {

+		if(borderItemEditPart instanceof TimeObservationNameEditPart) {

+			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else if(borderItemEditPart instanceof TimeObservationStereotypeLabelEditPart) {

+			IBorderItemLocator locator = new ExternalLabelPositionLocator(getMainFigure());

+			borderItemContainer.add(borderItemEditPart.getFigure(), locator);

+		} else {

+			super.addBorderItem(borderItemContainer, borderItemEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createMainFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(TimeObservationNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEventEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEventEditPart.java
index 6e148d2c652..98e68f67098 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEventEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationEventEditPart.java
@@ -1,66 +1,65 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;
-import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.TimeObservationEventSemanticEditPolicy;
-
-/**
- * @generated
- */
-public class TimeObservationEventEditPart extends ConnectionEditPart
-		implements ITreeBranchEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4018;
-
-	/**
-	 * @generated
-	 */
-	public TimeObservationEventEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new TimeObservationEventSemanticEditPolicy());
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected Connection createConnectionFigure() {
-		return new SimpleDashedEdgeFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	public SimpleDashedEdgeFigure getPrimaryShape() {
-		return (SimpleDashedEdgeFigure) getFigure();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.SimpleDashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.TimeObservationEventSemanticEditPolicy;

+

+/**

+ * @generated

+ */

+public class TimeObservationEventEditPart extends ConnectionEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 4018;

+

+	/**

+	 * @generated

+	 */

+	public TimeObservationEventEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new TimeObservationEventSemanticEditPolicy());

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected Connection createConnectionFigure() {

+		return new SimpleDashedEdgeFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public SimpleDashedEdgeFigure getPrimaryShape() {

+		return (SimpleDashedEdgeFigure)getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationNameEditPart.java
index 49e1ee2e097..64fd8d20aaa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationNameEditPart.java
@@ -1,791 +1,783 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class TimeObservationNameEditPart extends LabelEditPart
-		implements ITextAwareEditPart, IBorderItemEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5142;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationNameEditPart.VISUAL_ID), new Point(0, 0));
-	}
-
-	/**
-	 * @generated
-	 */
-	public TimeObservationNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public IBorderItemLocator getBorderItemLocator() {
-		IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator) constraint;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void refreshBounds() {
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.TimeObservation_2094, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new WrappingLabel();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class TimeObservationNameEditPart extends LabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5142;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationNameEditPart.VISUAL_ID), new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public TimeObservationNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

+			return (IBorderItemLocator)constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.TimeObservation_2094, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new WrappingLabel();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationStereotypeLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationStereotypeLabelEditPart.java
index f3540b730f6..fcde4a3b766 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationStereotypeLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/TimeObservationStereotypeLabelEditPart.java
@@ -1,796 +1,787 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class TimeObservationStereotypeLabelEditPart extends
-		AbstractLabelEditPart
-		implements ITextAwareEditPart, IBorderItemEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5143;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationStereotypeLabelEditPart.VISUAL_ID), new Point(0, 0));
-	}
-
-	/**
-	 * @generated
-	 */
-	public TimeObservationStereotypeLabelEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeExternalNodeEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public IBorderItemLocator getBorderItemLocator() {
-		IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (IBorderItemLocator) constraint;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void refreshBounds() {
-		int x = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		int width = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.TimeObservation_2094, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationStereotypeLabelEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigurePrim() {
-		return new AppliedStereotypeWrappingLabelFigure();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editparts.AbstractLabelEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeExternalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.AppliedStereotypeWrappingLabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class TimeObservationStereotypeLabelEditPart extends AbstractLabelEditPart implements ITextAwareEditPart, IBorderItemEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5143;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationStereotypeLabelEditPart.VISUAL_ID), new Point(0, 0));

+	}

+

+	/**

+	 * @generated

+	 */

+	public TimeObservationStereotypeLabelEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeExternalNodeEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public IBorderItemLocator getBorderItemLocator() {

+		IFigure parentFigure = getFigure().getParent();

+		if(parentFigure != null && parentFigure.getLayoutManager() != null) {

+			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());

+			return (IBorderItemLocator)constraint;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshBounds() {

+		int x = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_X())).intValue();

+		int y = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getLocation_Y())).intValue();

+		int width = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Width())).intValue();

+		int height = ((Integer)getStructuralFeatureValue(NotationPackage.eINSTANCE.getSize_Height())).intValue();

+		getBorderItemLocator().setConstraint(new Rectangle(x, y, width, height));

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.TimeObservation_2094, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationStereotypeLabelEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		IFigure label = createFigurePrim();

+		defaultText = getLabelTextHelper(label);

+		return label;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigurePrim() {

+		return new AppliedStereotypeWrappingLabelFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UMLEditPartFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UMLEditPartFactory.java
index eb8a48f6ac9..9c3e627cb85 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UMLEditPartFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UMLEditPartFactory.java
@@ -1,631 +1,912 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.directedit.locator.CellEditorLocatorAccess;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.IMultilineEditableFigure;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @generated
- */
-public class UMLEditPartFactory implements EditPartFactory {
-	/**
-	 * @generated
-	 */
-	public EditPart createEditPart(EditPart context, Object model) {
-		if (model instanceof View) {
-			View view = (View) model;
-			switch (UMLVisualIDRegistry.getVisualID(view)) {
-			case CompositeStructureDiagramEditPart.VISUAL_ID:
-				return new CompositeStructureDiagramEditPart(view);
-			case ActivityCompositeEditPart.VISUAL_ID:
-				return new ActivityCompositeEditPart(view);
-			case ActivityCompositeNameEditPart.VISUAL_ID:
-				return new ActivityCompositeNameEditPart(view);
-			case InteractionCompositeEditPart.VISUAL_ID:
-				return new InteractionCompositeEditPart(view);
-			case InteractionCompositeNameEditPart.VISUAL_ID:
-				return new InteractionCompositeNameEditPart(view);
-			case ProtocolStateMachineCompositeEditPart.VISUAL_ID:
-				return new ProtocolStateMachineCompositeEditPart(view);
-			case ProtocolStateMachineCompositeNameEditPart.VISUAL_ID:
-				return new ProtocolStateMachineCompositeNameEditPart(view);
-			case StateMachineCompositeEditPart.VISUAL_ID:
-				return new StateMachineCompositeEditPart(view);
-			case StateMachineCompositeNameEditPart.VISUAL_ID:
-				return new StateMachineCompositeNameEditPart(view);
-			case FunctionBehaviorCompositeEditPart.VISUAL_ID:
-				return new FunctionBehaviorCompositeEditPart(view);
-			case FunctionBehaviorCompositeNameEditPart.VISUAL_ID:
-				return new FunctionBehaviorCompositeNameEditPart(view);
-			case OpaqueBehaviorCompositeEditPart.VISUAL_ID:
-				return new OpaqueBehaviorCompositeEditPart(view);
-			case OpaqueBehaviorCompositeNameEditPart.VISUAL_ID:
-				return new OpaqueBehaviorCompositeNameEditPart(view);
-			case ComponentCompositeEditPart.VISUAL_ID:
-				return new ComponentCompositeEditPart(view);
-			case ComponentCompositeNameEditPart.VISUAL_ID:
-				return new ComponentCompositeNameEditPart(view);
-			case DeviceCompositeEditPart.VISUAL_ID:
-				return new DeviceCompositeEditPart(view);
-			case DeviceCompositeNameEditPart.VISUAL_ID:
-				return new DeviceCompositeNameEditPart(view);
-			case ExecutionEnvironmentCompositeEditPart.VISUAL_ID:
-				return new ExecutionEnvironmentCompositeEditPart(view);
-			case ExecutionEnvironmentCompositeNameEditPart.VISUAL_ID:
-				return new ExecutionEnvironmentCompositeNameEditPart(view);
-			case NodeCompositeEditPart.VISUAL_ID:
-				return new NodeCompositeEditPart(view);
-			case NodeCompositeNameEditPart.VISUAL_ID:
-				return new NodeCompositeNameEditPart(view);
-			case ClassCompositeEditPart.VISUAL_ID:
-				return new ClassCompositeEditPart(view);
-			case ClassCompositeNameEditPart.VISUAL_ID:
-				return new ClassCompositeNameEditPart(view);
-			case CollaborationCompositeEditPart.VISUAL_ID:
-				return new CollaborationCompositeEditPart(view);
-			case CollaborationCompositeNameEditPart.VISUAL_ID:
-				return new CollaborationCompositeNameEditPart(view);
-			case InterfaceEditPart.VISUAL_ID:
-				return new InterfaceEditPart(view);
-			case InterfaceNameEditPart.VISUAL_ID:
-				return new InterfaceNameEditPart(view);
-			case PrimitiveTypeEditPart.VISUAL_ID:
-				return new PrimitiveTypeEditPart(view);
-			case PrimitiveTypeNameEditPart.VISUAL_ID:
-				return new PrimitiveTypeNameEditPart(view);
-			case EnumerationEditPart.VISUAL_ID:
-				return new EnumerationEditPart(view);
-			case EnumerationNameEditPart.VISUAL_ID:
-				return new EnumerationNameEditPart(view);
-			case DataTypeEditPart.VISUAL_ID:
-				return new DataTypeEditPart(view);
-			case DataTypeNameEditPart.VISUAL_ID:
-				return new DataTypeNameEditPart(view);
-			case ActorEditPart.VISUAL_ID:
-				return new ActorEditPart(view);
-			case ActorNameEditPart.VISUAL_ID:
-				return new ActorNameEditPart(view);
-			case DeploymentSpecificationEditPart.VISUAL_ID:
-				return new DeploymentSpecificationEditPart(view);
-			case DeploymentSpecificationNameEditPart.VISUAL_ID:
-				return new DeploymentSpecificationNameEditPart(view);
-			case ArtifactEditPart.VISUAL_ID:
-				return new ArtifactEditPart(view);
-			case ArtifactNameEditPart.VISUAL_ID:
-				return new ArtifactNameEditPart(view);
-			case InformationItemEditPart.VISUAL_ID:
-				return new InformationItemEditPart(view);
-			case InformationItemNameEditPart.VISUAL_ID:
-				return new InformationItemNameEditPart(view);
-			case SignalEditPart.VISUAL_ID:
-				return new SignalEditPart(view);
-			case SignalNameEditPart.VISUAL_ID:
-				return new SignalNameEditPart(view);
-			case UseCaseEditPart.VISUAL_ID:
-				return new UseCaseEditPart(view);
-			case UseCaseNameEditPart.VISUAL_ID:
-				return new UseCaseNameEditPart(view);
-			case SignalEventEditPart.VISUAL_ID:
-				return new SignalEventEditPart(view);
-			case SignalEventNameEditPart.VISUAL_ID:
-				return new SignalEventNameEditPart(view);
-			case CallEventEditPart.VISUAL_ID:
-				return new CallEventEditPart(view);
-			case CallEventNameEditPart.VISUAL_ID:
-				return new CallEventNameEditPart(view);
-			case AnyReceiveEventEditPart.VISUAL_ID:
-				return new AnyReceiveEventEditPart(view);
-			case AnyReceiveEventNameEditPart.VISUAL_ID:
-				return new AnyReceiveEventNameEditPart(view);
-			case ChangeEventEditPart.VISUAL_ID:
-				return new ChangeEventEditPart(view);
-			case ChangeEventNameEditPart.VISUAL_ID:
-				return new ChangeEventNameEditPart(view);
-			case TimeEventEditPart.VISUAL_ID:
-				return new TimeEventEditPart(view);
-			case TimeEventNameEditPart.VISUAL_ID:
-				return new TimeEventNameEditPart(view);
-			case DurationObservationEditPart.VISUAL_ID:
-				return new DurationObservationEditPart(view);
-			case DurationObservationNameEditPart.VISUAL_ID:
-				return new DurationObservationNameEditPart(view);
-			case DurationObservationStereotypeLabelEditPart.VISUAL_ID:
-				return new DurationObservationStereotypeLabelEditPart(view);
-			case TimeObservationEditPart.VISUAL_ID:
-				return new TimeObservationEditPart(view);
-			case TimeObservationNameEditPart.VISUAL_ID:
-				return new TimeObservationNameEditPart(view);
-			case TimeObservationStereotypeLabelEditPart.VISUAL_ID:
-				return new TimeObservationStereotypeLabelEditPart(view);
-			case LiteralBooleanEditPart.VISUAL_ID:
-				return new LiteralBooleanEditPart(view);
-			case LiteralBooleanNameEditPart.VISUAL_ID:
-				return new LiteralBooleanNameEditPart(view);
-			case LiteralIntegerEditPart.VISUAL_ID:
-				return new LiteralIntegerEditPart(view);
-			case LiteralIntegerNameEditPart.VISUAL_ID:
-				return new LiteralIntegerNameEditPart(view);
-			case LiteralNullEditPart.VISUAL_ID:
-				return new LiteralNullEditPart(view);
-			case LiteralNullNameEditPart.VISUAL_ID:
-				return new LiteralNullNameEditPart(view);
-			case LiteralStringEditPart.VISUAL_ID:
-				return new LiteralStringEditPart(view);
-			case LiteralStringNameEditPart.VISUAL_ID:
-				return new LiteralStringNameEditPart(view);
-			case LiteralUnlimitedNaturalEditPart.VISUAL_ID:
-				return new LiteralUnlimitedNaturalEditPart(view);
-			case LiteralUnlimitedNaturalNameEditPart.VISUAL_ID:
-				return new LiteralUnlimitedNaturalNameEditPart(view);
-			case StringExpressionEditPart.VISUAL_ID:
-				return new StringExpressionEditPart(view);
-			case StringExpressionNameEditPart.VISUAL_ID:
-				return new StringExpressionNameEditPart(view);
-			case OpaqueExpressionEditPart.VISUAL_ID:
-				return new OpaqueExpressionEditPart(view);
-			case OpaqueExpressionNameEditPart.VISUAL_ID:
-				return new OpaqueExpressionNameEditPart(view);
-			case TimeExpressionEditPart.VISUAL_ID:
-				return new TimeExpressionEditPart(view);
-			case TimeExpressionNameEditPart.VISUAL_ID:
-				return new TimeExpressionNameEditPart(view);
-			case ExpressionEditPart.VISUAL_ID:
-				return new ExpressionEditPart(view);
-			case ExpressionNameEditPart.VISUAL_ID:
-				return new ExpressionNameEditPart(view);
-			case DurationEditPart.VISUAL_ID:
-				return new DurationEditPart(view);
-			case DurationNameEditPart.VISUAL_ID:
-				return new DurationNameEditPart(view);
-			case TimeIntervalEditPart.VISUAL_ID:
-				return new TimeIntervalEditPart(view);
-			case TimeIntervalNameEditPart.VISUAL_ID:
-				return new TimeIntervalNameEditPart(view);
-			case DurationIntervalEditPart.VISUAL_ID:
-				return new DurationIntervalEditPart(view);
-			case DurationIntervalNameEditPart.VISUAL_ID:
-				return new DurationIntervalNameEditPart(view);
-			case IntervalEditPart.VISUAL_ID:
-				return new IntervalEditPart(view);
-			case IntervalNameEditPart.VISUAL_ID:
-				return new IntervalNameEditPart(view);
-			case InstanceValueEditPart.VISUAL_ID:
-				return new InstanceValueEditPart(view);
-			case InstanceValueNameEditPart.VISUAL_ID:
-				return new InstanceValueNameEditPart(view);
-			case CommentEditPart.VISUAL_ID:
-				return new CommentEditPart(view);
-			case CommentBodyEditPart.VISUAL_ID:
-				return new CommentBodyEditPart(view);
-			case DurationConstraintEditPart.VISUAL_ID:
-				return new DurationConstraintEditPart(view);
-			case DurationConstraintNameEditPart.VISUAL_ID:
-				return new DurationConstraintNameEditPart(view);
-			case DurationConstraintSpecificationEditPart.VISUAL_ID:
-				return new DurationConstraintSpecificationEditPart(view);
-			case TimeConstraintEditPart.VISUAL_ID:
-				return new TimeConstraintEditPart(view);
-			case TimeConstraintNameEditPart.VISUAL_ID:
-				return new TimeConstraintNameEditPart(view);
-			case TimeConstraintSpecificationEditPart.VISUAL_ID:
-				return new TimeConstraintSpecificationEditPart(view);
-			case IntervalConstraintEditPart.VISUAL_ID:
-				return new IntervalConstraintEditPart(view);
-			case IntervalConstraintNameEditPart.VISUAL_ID:
-				return new IntervalConstraintNameEditPart(view);
-			case IntervalConstraintSpecificationEditPart.VISUAL_ID:
-				return new IntervalConstraintSpecificationEditPart(view);
-			case InteractionConstraintEditPart.VISUAL_ID:
-				return new InteractionConstraintEditPart(view);
-			case InteractionConstraintNameEditPart.VISUAL_ID:
-				return new InteractionConstraintNameEditPart(view);
-			case InteractionConstraintSpecificationEditPart.VISUAL_ID:
-				return new InteractionConstraintSpecificationEditPart(view);
-			case ConstraintEditPart.VISUAL_ID:
-				return new ConstraintEditPart(view);
-			case ConstraintNameEditPart.VISUAL_ID:
-				return new ConstraintNameEditPart(view);
-			case ConstraintSpecificationEditPart.VISUAL_ID:
-				return new ConstraintSpecificationEditPart(view);
-			case BehaviorPortEditPart.VISUAL_ID:
-				return new BehaviorPortEditPart(view);
-			case PortEditPart.VISUAL_ID:
-				return new PortEditPart(view);
-			case PortNameEditPart.VISUAL_ID:
-				return new PortNameEditPart(view);
-			case PortAppliedStereotypeEditPart.VISUAL_ID:
-				return new PortAppliedStereotypeEditPart(view);
-			case ParameterEditPart.VISUAL_ID:
-				return new ParameterEditPart(view);
-			case ParameterNameEditPart.VISUAL_ID:
-				return new ParameterNameEditPart(view);
-			case ParameterAppliedStereotypeEditPart.VISUAL_ID:
-				return new ParameterAppliedStereotypeEditPart(view);
-			case PropertyPartEditPartCN.VISUAL_ID:
-				return new PropertyPartEditPartCN(view);
-			case PropertyPartNameEditPartCN.VISUAL_ID:
-				return new PropertyPartNameEditPartCN(view);
-			case CollaborationRoleEditPartCN.VISUAL_ID:
-				return new CollaborationRoleEditPartCN(view);
-			case CollaborationRoleNameEditPartCN.VISUAL_ID:
-				return new CollaborationRoleNameEditPartCN(view);
-			case CollaborationUseEditPartCN.VISUAL_ID:
-				return new CollaborationUseEditPartCN(view);
-			case CollaborationUseNameEditPart.VISUAL_ID:
-				return new CollaborationUseNameEditPart(view);
-			case ActivityCompositeEditPartCN.VISUAL_ID:
-				return new ActivityCompositeEditPartCN(view);
-			case ActivityCompositeNameEditPartCN.VISUAL_ID:
-				return new ActivityCompositeNameEditPartCN(view);
-			case InteractionCompositeEditPartCN.VISUAL_ID:
-				return new InteractionCompositeEditPartCN(view);
-			case InteractionCompositeNameEditPartCN.VISUAL_ID:
-				return new InteractionCompositeNameEditPartCN(view);
-			case ProtocolStateMachineCompositeEditPartCN.VISUAL_ID:
-				return new ProtocolStateMachineCompositeEditPartCN(view);
-			case ProtocolStateMachineCompositeNameEditPartCN.VISUAL_ID:
-				return new ProtocolStateMachineCompositeNameEditPartCN(view);
-			case StateMachineCompositeEditPartCN.VISUAL_ID:
-				return new StateMachineCompositeEditPartCN(view);
-			case StateMachineCompositeNameEditPartCN.VISUAL_ID:
-				return new StateMachineCompositeNameEditPartCN(view);
-			case FunctionBehaviorCompositeEditPartCN.VISUAL_ID:
-				return new FunctionBehaviorCompositeEditPartCN(view);
-			case FunctionBehaviorCompositeNameEditPartCN.VISUAL_ID:
-				return new FunctionBehaviorCompositeNameEditPartCN(view);
-			case OpaqueBehaviorCompositeEditPartCN.VISUAL_ID:
-				return new OpaqueBehaviorCompositeEditPartCN(view);
-			case OpaqueBehaviorCompositeNameEditPartCN.VISUAL_ID:
-				return new OpaqueBehaviorCompositeNameEditPartCN(view);
-			case ComponentCompositeEditPartCN.VISUAL_ID:
-				return new ComponentCompositeEditPartCN(view);
-			case ComponentCompositeNameEditPartCN.VISUAL_ID:
-				return new ComponentCompositeNameEditPartCN(view);
-			case DeviceCompositeEditPartCN.VISUAL_ID:
-				return new DeviceCompositeEditPartCN(view);
-			case DeviceCompositeNameEditPartCN.VISUAL_ID:
-				return new DeviceCompositeNameEditPartCN(view);
-			case ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID:
-				return new ExecutionEnvironmentCompositeEditPartCN(view);
-			case ExecutionEnvironmentCompositeNameEditPartCN.VISUAL_ID:
-				return new ExecutionEnvironmentCompositeNameEditPartCN(view);
-			case NodeCompositeEditPartCN.VISUAL_ID:
-				return new NodeCompositeEditPartCN(view);
-			case NodeCompositeNameEditPartCN.VISUAL_ID:
-				return new NodeCompositeNameEditPartCN(view);
-			case ClassCompositeEditPartCN.VISUAL_ID:
-				return new ClassCompositeEditPartCN(view);
-			case ClassCompositeNameEditPartCN.VISUAL_ID:
-				return new ClassCompositeNameEditPartCN(view);
-			case CollaborationCompositeEditPartCN.VISUAL_ID:
-				return new CollaborationCompositeEditPartCN(view);
-			case CollaborationCompositeNameEditPartCN.VISUAL_ID:
-				return new CollaborationCompositeNameEditPartCN(view);
-			case InterfaceEditPartCN.VISUAL_ID:
-				return new InterfaceEditPartCN(view);
-			case InterfaceNameEditPartCN.VISUAL_ID:
-				return new InterfaceNameEditPartCN(view);
-			case PrimitiveTypeEditPartCN.VISUAL_ID:
-				return new PrimitiveTypeEditPartCN(view);
-			case PrimitiveTypeNameEditPartCN.VISUAL_ID:
-				return new PrimitiveTypeNameEditPartCN(view);
-			case EnumerationEditPartCN.VISUAL_ID:
-				return new EnumerationEditPartCN(view);
-			case EnumerationNameEditPartCN.VISUAL_ID:
-				return new EnumerationNameEditPartCN(view);
-			case DataTypeEditPartCN.VISUAL_ID:
-				return new DataTypeEditPartCN(view);
-			case DataTypeNameEditPartCN.VISUAL_ID:
-				return new DataTypeNameEditPartCN(view);
-			case ActorEditPartCN.VISUAL_ID:
-				return new ActorEditPartCN(view);
-			case ActorNameEditPartCN.VISUAL_ID:
-				return new ActorNameEditPartCN(view);
-			case DeploymentSpecificationEditPartCN.VISUAL_ID:
-				return new DeploymentSpecificationEditPartCN(view);
-			case DeploymentSpecificationNameEditPartCN.VISUAL_ID:
-				return new DeploymentSpecificationNameEditPartCN(view);
-			case ArtifactEditPartCN.VISUAL_ID:
-				return new ArtifactEditPartCN(view);
-			case ArtifactNameEditPartCN.VISUAL_ID:
-				return new ArtifactNameEditPartCN(view);
-			case InformationItemEditPartCN.VISUAL_ID:
-				return new InformationItemEditPartCN(view);
-			case InformationItemNameEditPartCN.VISUAL_ID:
-				return new InformationItemNameEditPartCN(view);
-			case SignalEditPartCN.VISUAL_ID:
-				return new SignalEditPartCN(view);
-			case SignalNameEditPartCN.VISUAL_ID:
-				return new SignalNameEditPartCN(view);
-			case UseCaseEditPartCN.VISUAL_ID:
-				return new UseCaseEditPartCN(view);
-			case UseCaseNameEditPartCN.VISUAL_ID:
-				return new UseCaseNameEditPartCN(view);
-			case CommentEditPartCN.VISUAL_ID:
-				return new CommentEditPartCN(view);
-			case CommentBodyEditPartCN.VISUAL_ID:
-				return new CommentBodyEditPartCN(view);
-			case DurationConstraintEditPartCN.VISUAL_ID:
-				return new DurationConstraintEditPartCN(view);
-			case DurationConstraintNameEditPartCN.VISUAL_ID:
-				return new DurationConstraintNameEditPartCN(view);
-			case DurationConstraintSpecificationEditPartCN.VISUAL_ID:
-				return new DurationConstraintSpecificationEditPartCN(view);
-			case TimeConstraintEditPartCN.VISUAL_ID:
-				return new TimeConstraintEditPartCN(view);
-			case TimeConstraintNameEditPartCN.VISUAL_ID:
-				return new TimeConstraintNameEditPartCN(view);
-			case TimeConstraintSpecificationEditPartCN.VISUAL_ID:
-				return new TimeConstraintSpecificationEditPartCN(view);
-			case IntervalConstraintEditPartCN.VISUAL_ID:
-				return new IntervalConstraintEditPartCN(view);
-			case IntervalConstraintNameEditPartCN.VISUAL_ID:
-				return new IntervalConstraintNameEditPartCN(view);
-			case IntervalConstraintSpecificationEditPartCN.VISUAL_ID:
-				return new IntervalConstraintSpecificationEditPartCN(view);
-			case InteractionConstraintEditPartCN.VISUAL_ID:
-				return new InteractionConstraintEditPartCN(view);
-			case InteractionConstraintNameEditPartCN.VISUAL_ID:
-				return new InteractionConstraintNameEditPartCN(view);
-			case InteractionConstraintSpecificationEditPartCN.VISUAL_ID:
-				return new InteractionConstraintSpecificationEditPartCN(view);
-			case ConstraintEditPartCN.VISUAL_ID:
-				return new ConstraintEditPartCN(view);
-			case ConstraintNameEditPartCN.VISUAL_ID:
-				return new ConstraintNameEditPartCN(view);
-			case ConstraintSpecificationEditPartCN.VISUAL_ID:
-				return new ConstraintSpecificationEditPartCN(view);
-			case PropertyEditPartCLN.VISUAL_ID:
-				return new PropertyEditPartCLN(view);
-			case OperationEditPartCLN.VISUAL_ID:
-				return new OperationEditPartCLN(view);
-			case EnumerationLiteralEditPartCLN.VISUAL_ID:
-				return new EnumerationLiteralEditPartCLN(view);
-			case DataTypeAttributeCompartmentEditPart.VISUAL_ID:
-				return new DataTypeAttributeCompartmentEditPart(view);
-			case DataTypeOperationCompartmentEditPart.VISUAL_ID:
-				return new DataTypeOperationCompartmentEditPart(view);
-			case DataTypeAttributeCompartmentEditPartCN.VISUAL_ID:
-				return new DataTypeAttributeCompartmentEditPartCN(view);
-			case DataTypeOperationCompartmentEditPartCN.VISUAL_ID:
-				return new DataTypeOperationCompartmentEditPartCN(view);
-			case EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID:
-				return new EnumerationEnumerationLiteralCompartmentEditPart(view);
-			case EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID:
-				return new EnumerationEnumerationLiteralCompartmentEditPartCN(view);
-			case ActivityCompositeCompartmentEditPartCN.VISUAL_ID:
-				return new ActivityCompositeCompartmentEditPartCN(view);
-			case InteractionCompositeCompartmentEditPartCN.VISUAL_ID:
-				return new InteractionCompositeCompartmentEditPartCN(view);
-			case ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID:
-				return new ProtocolStateMachineCompositeCompartmentEditPartCN(view);
-			case StateMachineCompositeCompartmentEditPartCN.VISUAL_ID:
-				return new StateMachineCompositeCompartmentEditPartCN(view);
-			case FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:
-				return new FunctionBehaviorCompositeCompartmentEditPartCN(view);
-			case OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:
-				return new OpaqueBehaviorCompositeCompartmentEditPartCN(view);
-			case ComponentCompositeCompartmentEditPartCN.VISUAL_ID:
-				return new ComponentCompositeCompartmentEditPartCN(view);
-			case DeviceCompositeCompartmentEditPartCN.VISUAL_ID:
-				return new DeviceCompositeCompartmentEditPartCN(view);
-			case ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID:
-				return new ExecutionEnvironmentCompositeCompartmentEditPartCN(view);
-			case NodeCompositeCompartmentEditPartCN.VISUAL_ID:
-				return new NodeCompositeCompartmentEditPartCN(view);
-			case ClassCompositeCompartmentEditPartCN.VISUAL_ID:
-				return new ClassCompositeCompartmentEditPartCN(view);
-			case CollaborationCompositeCompartmentEditPartCN.VISUAL_ID:
-				return new CollaborationCompositeCompartmentEditPartCN(view);
-			case ActivityCompositeCompartmentEditPart.VISUAL_ID:
-				return new ActivityCompositeCompartmentEditPart(view);
-			case InteractionCompositeCompartmentEditPart.VISUAL_ID:
-				return new InteractionCompositeCompartmentEditPart(view);
-			case ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID:
-				return new ProtocolStateMachineCompositeCompartmentEditPart(view);
-			case StateMachineCompositeCompartmentEditPart.VISUAL_ID:
-				return new StateMachineCompositeCompartmentEditPart(view);
-			case FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID:
-				return new FunctionBehaviorCompositeCompartmentEditPart(view);
-			case OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID:
-				return new OpaqueBehaviorCompositeCompartmentEditPart(view);
-			case ComponentCompositeCompartmentEditPart.VISUAL_ID:
-				return new ComponentCompositeCompartmentEditPart(view);
-			case DeviceCompositeCompartmentEditPart.VISUAL_ID:
-				return new DeviceCompositeCompartmentEditPart(view);
-			case ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID:
-				return new ExecutionEnvironmentCompositeCompartmentEditPart(view);
-			case NodeCompositeCompartmentEditPart.VISUAL_ID:
-				return new NodeCompositeCompartmentEditPart(view);
-			case ClassCompositeCompartmentEditPart.VISUAL_ID:
-				return new ClassCompositeCompartmentEditPart(view);
-			case CollaborationCompositeCompartmentEditPart.VISUAL_ID:
-				return new CollaborationCompositeCompartmentEditPart(view);
-			case PropertyPartCompartmentEditPartCN.VISUAL_ID:
-				return new PropertyPartCompartmentEditPartCN(view);
-			case BehaviorPortLinkEditPart.VISUAL_ID:
-				return new BehaviorPortLinkEditPart(view);
-			case LinkDescriptorEditPart.VISUAL_ID:
-				return new LinkDescriptorEditPart(view);
-			case CommentAnnotatedElementEditPart.VISUAL_ID:
-				return new CommentAnnotatedElementEditPart(view);
-			case ConstraintConstrainedElementEditPart.VISUAL_ID:
-				return new ConstraintConstrainedElementEditPart(view);
-			case ComponentRealizationEditPart.VISUAL_ID:
-				return new ComponentRealizationEditPart(view);
-			case ComponentRealizationNameEditPart.VISUAL_ID:
-				return new ComponentRealizationNameEditPart(view);
-			case ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID:
-				return new ComponentRealizationAppliedStereotypeEditPart(view);
-			case InterfaceRealizationEditPart.VISUAL_ID:
-				return new InterfaceRealizationEditPart(view);
-			case InterfaceRealizationNameEditPart.VISUAL_ID:
-				return new InterfaceRealizationNameEditPart(view);
-			case InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID:
-				return new InterfaceRealizationAppliedStereotypeEditPart(view);
-			case SubstitutionEditPart.VISUAL_ID:
-				return new SubstitutionEditPart(view);
-			case SubstitutionNameEditPart.VISUAL_ID:
-				return new SubstitutionNameEditPart(view);
-			case SubstitutionAppliedStereotypeEditPart.VISUAL_ID:
-				return new SubstitutionAppliedStereotypeEditPart(view);
-			case RealizationEditPart.VISUAL_ID:
-				return new RealizationEditPart(view);
-			case RealizationNameEditPart.VISUAL_ID:
-				return new RealizationNameEditPart(view);
-			case RealizationAppliedStereotypeEditPart.VISUAL_ID:
-				return new RealizationAppliedStereotypeEditPart(view);
-			case ManifestationEditPart.VISUAL_ID:
-				return new ManifestationEditPart(view);
-			case ManifestationNameEditPart.VISUAL_ID:
-				return new ManifestationNameEditPart(view);
-			case ManifestationAppliedStereotypeEditPart.VISUAL_ID:
-				return new ManifestationAppliedStereotypeEditPart(view);
-			case AbstractionEditPart.VISUAL_ID:
-				return new AbstractionEditPart(view);
-			case AbstractionNameEditPart.VISUAL_ID:
-				return new AbstractionNameEditPart(view);
-			case AbstractionAppliedStereotypeEditPart.VISUAL_ID:
-				return new AbstractionAppliedStereotypeEditPart(view);
-			case UsageEditPart.VISUAL_ID:
-				return new UsageEditPart(view);
-			case UsageNameEditPart.VISUAL_ID:
-				return new UsageNameEditPart(view);
-			case UsageAppliedStereotypeEditPart.VISUAL_ID:
-				return new UsageAppliedStereotypeEditPart(view);
-			case DeploymentEditPart.VISUAL_ID:
-				return new DeploymentEditPart(view);
-			case DeploymentNameEditPart.VISUAL_ID:
-				return new DeploymentNameEditPart(view);
-			case DeploymentAppliedStereotypeEditPart.VISUAL_ID:
-				return new DeploymentAppliedStereotypeEditPart(view);
-			case RoleBindingEditPart.VISUAL_ID:
-				return new RoleBindingEditPart(view);
-			case RoleBindingRoleNameEditPart.VISUAL_ID:
-				return new RoleBindingRoleNameEditPart(view);
-			case RoleBindingAppliedStereotypeEditPart.VISUAL_ID:
-				return new RoleBindingAppliedStereotypeEditPart(view);
-			case DependencyEditPart.VISUAL_ID:
-				return new DependencyEditPart(view);
-			case DependencyNameEditPart.VISUAL_ID:
-				return new DependencyNameEditPart(view);
-			case DependencyAppliedStereotypeEditPart.VISUAL_ID:
-				return new DependencyAppliedStereotypeEditPart(view);
-			case ConnectorEditPart.VISUAL_ID:
-				return new ConnectorEditPart(view);
-			case ConnectorAppliedStereotypeEditPart.VISUAL_ID:
-				return new ConnectorAppliedStereotypeEditPart(view);
-			case ConnectorNameEditPart.VISUAL_ID:
-				return new ConnectorNameEditPart(view);
-			case ConnectorMultiplicitySourceEditPart.VISUAL_ID:
-				return new ConnectorMultiplicitySourceEditPart(view);
-			case ConnectorMultiplicityTargetEditPart.VISUAL_ID:
-				return new ConnectorMultiplicityTargetEditPart(view);
-			case GeneralizationEditPart.VISUAL_ID:
-				return new GeneralizationEditPart(view);
-			case GeneralizationAppliedStereotypeEditPart.VISUAL_ID:
-				return new GeneralizationAppliedStereotypeEditPart(view);
-			case TimeObservationEventEditPart.VISUAL_ID:
-				return new TimeObservationEventEditPart(view);
-			case DurationObservationEventEditPart.VISUAL_ID:
-				return new DurationObservationEventEditPart(view);
-			case RepresentationEditPart.VISUAL_ID:
-				return new RepresentationEditPart(view);
-			case RepresentationTagLabelEditPart.VISUAL_ID:
-				return new RepresentationTagLabelEditPart(view);
-			case InformationFlowEditPart.VISUAL_ID:
-				return new InformationFlowEditPart(view);
-			case InformationFlowConveyedLabelEditPart.VISUAL_ID:
-				return new InformationFlowConveyedLabelEditPart(view);
-			case InformationFlowAppliedStereotypeEditPart.VISUAL_ID:
-				return new InformationFlowAppliedStereotypeEditPart(view);
-			}
-		}
-		return createUnrecognizedEditPart(context, model);
-	}
-
-	/**
-	 * @generated
-	 */
-	private EditPart createUnrecognizedEditPart(EditPart context, Object model) {
-		// Handle creation of unrecognized child node EditParts here
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static CellEditorLocator getTextCellEditorLocator(
-			ITextAwareEditPart source) {
-		if (source.getFigure() instanceof IMultilineEditableFigure) {
-			return new MultilineCellEditorLocator(
-					(IMultilineEditableFigure) source.getFigure());
-		}
-		else {
-			return CellEditorLocatorAccess.INSTANCE.getTextCellEditorLocator(source);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	static private class MultilineCellEditorLocator implements CellEditorLocator {
-		/**
-		 * @generated
-		 */
-		private IMultilineEditableFigure multilineEditableFigure;
-
-		/**
-		 * @generated
-		 */
-		public MultilineCellEditorLocator(IMultilineEditableFigure figure) {
-			this.multilineEditableFigure = figure;
-		}
-
-		/**
-		 * @generated
-		 */
-		public IMultilineEditableFigure getMultilineEditableFigure() {
-			return multilineEditableFigure;
-		}
-
-		/**
-		 * @generated
-		 */
-		public void relocate(CellEditor celleditor) {
-			Text text = (Text) celleditor.getControl();
-			Rectangle rect = getMultilineEditableFigure().getBounds().getCopy();
-			rect.x = getMultilineEditableFigure().getEditionLocation().x;
-			rect.y = getMultilineEditableFigure().getEditionLocation().y;
-			getMultilineEditableFigure().translateToAbsolute(rect);
-			if (getMultilineEditableFigure().getText().length() > 0) {
-				rect.setSize(new Dimension(text.computeSize(rect.width,
-						SWT.DEFAULT)));
-			}
-			if (!rect.equals(new Rectangle(text.getBounds()))) {
-				text.setBounds(rect.x, rect.y, rect.width, rect.height);
-			}
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.geometry.Dimension;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPartFactory;

+import org.eclipse.gef.tools.CellEditorLocator;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.directedit.locator.CellEditorLocatorAccess;

+import org.eclipse.jface.viewers.CellEditor;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.IMultilineEditableFigure;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.widgets.Text;

+

+/**

+ * @generated

+ */

+public class UMLEditPartFactory implements EditPartFactory {

+

+	/**

+	 * @generated

+	 */

+	public EditPart createEditPart(EditPart context, Object model) {

+		if(model instanceof View) {

+			View view = (View)model;

+			switch(UMLVisualIDRegistry.getVisualID(view)) {

+

+			case CompositeStructureDiagramEditPart.VISUAL_ID:

+				return new CompositeStructureDiagramEditPart(view);

+

+			case ActivityCompositeEditPart.VISUAL_ID:

+				return new ActivityCompositeEditPart(view);

+

+			case ActivityCompositeNameEditPart.VISUAL_ID:

+				return new ActivityCompositeNameEditPart(view);

+

+			case InteractionCompositeEditPart.VISUAL_ID:

+				return new InteractionCompositeEditPart(view);

+

+			case InteractionCompositeNameEditPart.VISUAL_ID:

+				return new InteractionCompositeNameEditPart(view);

+

+			case ProtocolStateMachineCompositeEditPart.VISUAL_ID:

+				return new ProtocolStateMachineCompositeEditPart(view);

+

+			case ProtocolStateMachineCompositeNameEditPart.VISUAL_ID:

+				return new ProtocolStateMachineCompositeNameEditPart(view);

+

+			case StateMachineCompositeEditPart.VISUAL_ID:

+				return new StateMachineCompositeEditPart(view);

+

+			case StateMachineCompositeNameEditPart.VISUAL_ID:

+				return new StateMachineCompositeNameEditPart(view);

+

+			case FunctionBehaviorCompositeEditPart.VISUAL_ID:

+				return new FunctionBehaviorCompositeEditPart(view);

+

+			case FunctionBehaviorCompositeNameEditPart.VISUAL_ID:

+				return new FunctionBehaviorCompositeNameEditPart(view);

+

+			case OpaqueBehaviorCompositeEditPart.VISUAL_ID:

+				return new OpaqueBehaviorCompositeEditPart(view);

+

+			case OpaqueBehaviorCompositeNameEditPart.VISUAL_ID:

+				return new OpaqueBehaviorCompositeNameEditPart(view);

+

+			case ComponentCompositeEditPart.VISUAL_ID:

+				return new ComponentCompositeEditPart(view);

+

+			case ComponentCompositeNameEditPart.VISUAL_ID:

+				return new ComponentCompositeNameEditPart(view);

+

+			case DeviceCompositeEditPart.VISUAL_ID:

+				return new DeviceCompositeEditPart(view);

+

+			case DeviceCompositeNameEditPart.VISUAL_ID:

+				return new DeviceCompositeNameEditPart(view);

+

+			case ExecutionEnvironmentCompositeEditPart.VISUAL_ID:

+				return new ExecutionEnvironmentCompositeEditPart(view);

+

+			case ExecutionEnvironmentCompositeNameEditPart.VISUAL_ID:

+				return new ExecutionEnvironmentCompositeNameEditPart(view);

+

+			case NodeCompositeEditPart.VISUAL_ID:

+				return new NodeCompositeEditPart(view);

+

+			case NodeCompositeNameEditPart.VISUAL_ID:

+				return new NodeCompositeNameEditPart(view);

+

+			case ClassCompositeEditPart.VISUAL_ID:

+				return new ClassCompositeEditPart(view);

+

+			case ClassCompositeNameEditPart.VISUAL_ID:

+				return new ClassCompositeNameEditPart(view);

+

+			case CollaborationCompositeEditPart.VISUAL_ID:

+				return new CollaborationCompositeEditPart(view);

+

+			case CollaborationCompositeNameEditPart.VISUAL_ID:

+				return new CollaborationCompositeNameEditPart(view);

+

+			case InterfaceEditPart.VISUAL_ID:

+				return new InterfaceEditPart(view);

+

+			case InterfaceNameEditPart.VISUAL_ID:

+				return new InterfaceNameEditPart(view);

+

+			case PrimitiveTypeEditPart.VISUAL_ID:

+				return new PrimitiveTypeEditPart(view);

+

+			case PrimitiveTypeNameEditPart.VISUAL_ID:

+				return new PrimitiveTypeNameEditPart(view);

+

+			case EnumerationEditPart.VISUAL_ID:

+				return new EnumerationEditPart(view);

+

+			case EnumerationNameEditPart.VISUAL_ID:

+				return new EnumerationNameEditPart(view);

+

+			case DataTypeEditPart.VISUAL_ID:

+				return new DataTypeEditPart(view);

+

+			case DataTypeNameEditPart.VISUAL_ID:

+				return new DataTypeNameEditPart(view);

+

+			case ActorEditPart.VISUAL_ID:

+				return new ActorEditPart(view);

+

+			case ActorNameEditPart.VISUAL_ID:

+				return new ActorNameEditPart(view);

+

+			case DeploymentSpecificationEditPart.VISUAL_ID:

+				return new DeploymentSpecificationEditPart(view);

+

+			case DeploymentSpecificationNameEditPart.VISUAL_ID:

+				return new DeploymentSpecificationNameEditPart(view);

+

+			case ArtifactEditPart.VISUAL_ID:

+				return new ArtifactEditPart(view);

+

+			case ArtifactNameEditPart.VISUAL_ID:

+				return new ArtifactNameEditPart(view);

+

+			case InformationItemEditPart.VISUAL_ID:

+				return new InformationItemEditPart(view);

+

+			case InformationItemNameEditPart.VISUAL_ID:

+				return new InformationItemNameEditPart(view);

+

+			case SignalEditPart.VISUAL_ID:

+				return new SignalEditPart(view);

+

+			case SignalNameEditPart.VISUAL_ID:

+				return new SignalNameEditPart(view);

+

+			case UseCaseEditPart.VISUAL_ID:

+				return new UseCaseEditPart(view);

+

+			case UseCaseNameEditPart.VISUAL_ID:

+				return new UseCaseNameEditPart(view);

+

+			case SignalEventEditPart.VISUAL_ID:

+				return new SignalEventEditPart(view);

+

+			case SignalEventNameEditPart.VISUAL_ID:

+				return new SignalEventNameEditPart(view);

+

+			case CallEventEditPart.VISUAL_ID:

+				return new CallEventEditPart(view);

+

+			case CallEventNameEditPart.VISUAL_ID:

+				return new CallEventNameEditPart(view);

+

+			case AnyReceiveEventEditPart.VISUAL_ID:

+				return new AnyReceiveEventEditPart(view);

+

+			case AnyReceiveEventNameEditPart.VISUAL_ID:

+				return new AnyReceiveEventNameEditPart(view);

+

+			case ChangeEventEditPart.VISUAL_ID:

+				return new ChangeEventEditPart(view);

+

+			case ChangeEventNameEditPart.VISUAL_ID:

+				return new ChangeEventNameEditPart(view);

+

+			case TimeEventEditPart.VISUAL_ID:

+				return new TimeEventEditPart(view);

+

+			case TimeEventNameEditPart.VISUAL_ID:

+				return new TimeEventNameEditPart(view);

+

+			case DurationObservationEditPart.VISUAL_ID:

+				return new DurationObservationEditPart(view);

+

+			case DurationObservationNameEditPart.VISUAL_ID:

+				return new DurationObservationNameEditPart(view);

+

+			case DurationObservationStereotypeLabelEditPart.VISUAL_ID:

+				return new DurationObservationStereotypeLabelEditPart(view);

+

+			case TimeObservationEditPart.VISUAL_ID:

+				return new TimeObservationEditPart(view);

+

+			case TimeObservationNameEditPart.VISUAL_ID:

+				return new TimeObservationNameEditPart(view);

+

+			case TimeObservationStereotypeLabelEditPart.VISUAL_ID:

+				return new TimeObservationStereotypeLabelEditPart(view);

+

+			case LiteralBooleanEditPart.VISUAL_ID:

+				return new LiteralBooleanEditPart(view);

+

+			case LiteralBooleanNameEditPart.VISUAL_ID:

+				return new LiteralBooleanNameEditPart(view);

+

+			case LiteralIntegerEditPart.VISUAL_ID:

+				return new LiteralIntegerEditPart(view);

+

+			case LiteralIntegerNameEditPart.VISUAL_ID:

+				return new LiteralIntegerNameEditPart(view);

+

+			case LiteralNullEditPart.VISUAL_ID:

+				return new LiteralNullEditPart(view);

+

+			case LiteralNullNameEditPart.VISUAL_ID:

+				return new LiteralNullNameEditPart(view);

+

+			case LiteralStringEditPart.VISUAL_ID:

+				return new LiteralStringEditPart(view);

+

+			case LiteralStringNameEditPart.VISUAL_ID:

+				return new LiteralStringNameEditPart(view);

+

+			case LiteralUnlimitedNaturalEditPart.VISUAL_ID:

+				return new LiteralUnlimitedNaturalEditPart(view);

+

+			case LiteralUnlimitedNaturalNameEditPart.VISUAL_ID:

+				return new LiteralUnlimitedNaturalNameEditPart(view);

+

+			case StringExpressionEditPart.VISUAL_ID:

+				return new StringExpressionEditPart(view);

+

+			case StringExpressionNameEditPart.VISUAL_ID:

+				return new StringExpressionNameEditPart(view);

+

+			case OpaqueExpressionEditPart.VISUAL_ID:

+				return new OpaqueExpressionEditPart(view);

+

+			case OpaqueExpressionNameEditPart.VISUAL_ID:

+				return new OpaqueExpressionNameEditPart(view);

+

+			case TimeExpressionEditPart.VISUAL_ID:

+				return new TimeExpressionEditPart(view);

+

+			case TimeExpressionNameEditPart.VISUAL_ID:

+				return new TimeExpressionNameEditPart(view);

+

+			case ExpressionEditPart.VISUAL_ID:

+				return new ExpressionEditPart(view);

+

+			case ExpressionNameEditPart.VISUAL_ID:

+				return new ExpressionNameEditPart(view);

+

+			case DurationEditPart.VISUAL_ID:

+				return new DurationEditPart(view);

+

+			case DurationNameEditPart.VISUAL_ID:

+				return new DurationNameEditPart(view);

+

+			case TimeIntervalEditPart.VISUAL_ID:

+				return new TimeIntervalEditPart(view);

+

+			case TimeIntervalNameEditPart.VISUAL_ID:

+				return new TimeIntervalNameEditPart(view);

+

+			case DurationIntervalEditPart.VISUAL_ID:

+				return new DurationIntervalEditPart(view);

+

+			case DurationIntervalNameEditPart.VISUAL_ID:

+				return new DurationIntervalNameEditPart(view);

+

+			case IntervalEditPart.VISUAL_ID:

+				return new IntervalEditPart(view);

+

+			case IntervalNameEditPart.VISUAL_ID:

+				return new IntervalNameEditPart(view);

+

+			case InstanceValueEditPart.VISUAL_ID:

+				return new InstanceValueEditPart(view);

+

+			case InstanceValueNameEditPart.VISUAL_ID:

+				return new InstanceValueNameEditPart(view);

+

+			case CommentEditPart.VISUAL_ID:

+				return new CommentEditPart(view);

+

+			case CommentBodyEditPart.VISUAL_ID:

+				return new CommentBodyEditPart(view);

+

+			case DurationConstraintEditPart.VISUAL_ID:

+				return new DurationConstraintEditPart(view);

+

+			case DurationConstraintNameEditPart.VISUAL_ID:

+				return new DurationConstraintNameEditPart(view);

+

+			case DurationConstraintSpecificationEditPart.VISUAL_ID:

+				return new DurationConstraintSpecificationEditPart(view);

+

+			case TimeConstraintEditPart.VISUAL_ID:

+				return new TimeConstraintEditPart(view);

+

+			case TimeConstraintNameEditPart.VISUAL_ID:

+				return new TimeConstraintNameEditPart(view);

+

+			case TimeConstraintSpecificationEditPart.VISUAL_ID:

+				return new TimeConstraintSpecificationEditPart(view);

+

+			case IntervalConstraintEditPart.VISUAL_ID:

+				return new IntervalConstraintEditPart(view);

+

+			case IntervalConstraintNameEditPart.VISUAL_ID:

+				return new IntervalConstraintNameEditPart(view);

+

+			case IntervalConstraintSpecificationEditPart.VISUAL_ID:

+				return new IntervalConstraintSpecificationEditPart(view);

+

+			case InteractionConstraintEditPart.VISUAL_ID:

+				return new InteractionConstraintEditPart(view);

+

+			case InteractionConstraintNameEditPart.VISUAL_ID:

+				return new InteractionConstraintNameEditPart(view);

+

+			case InteractionConstraintSpecificationEditPart.VISUAL_ID:

+				return new InteractionConstraintSpecificationEditPart(view);

+

+			case ConstraintEditPart.VISUAL_ID:

+				return new ConstraintEditPart(view);

+

+			case ConstraintNameEditPart.VISUAL_ID:

+				return new ConstraintNameEditPart(view);

+

+			case ConstraintSpecificationEditPart.VISUAL_ID:

+				return new ConstraintSpecificationEditPart(view);

+

+			case BehaviorPortEditPart.VISUAL_ID:

+				return new BehaviorPortEditPart(view);

+

+			case PortEditPart.VISUAL_ID:

+				return new PortEditPart(view);

+

+			case PortNameEditPart.VISUAL_ID:

+				return new PortNameEditPart(view);

+

+			case PortAppliedStereotypeEditPart.VISUAL_ID:

+				return new PortAppliedStereotypeEditPart(view);

+

+			case ParameterEditPart.VISUAL_ID:

+				return new ParameterEditPart(view);

+

+			case ParameterNameEditPart.VISUAL_ID:

+				return new ParameterNameEditPart(view);

+

+			case ParameterAppliedStereotypeEditPart.VISUAL_ID:

+				return new ParameterAppliedStereotypeEditPart(view);

+

+			case PropertyPartEditPartCN.VISUAL_ID:

+				return new PropertyPartEditPartCN(view);

+

+			case PropertyPartNameEditPartCN.VISUAL_ID:

+				return new PropertyPartNameEditPartCN(view);

+

+			case CollaborationRoleEditPartCN.VISUAL_ID:

+				return new CollaborationRoleEditPartCN(view);

+

+			case CollaborationRoleNameEditPartCN.VISUAL_ID:

+				return new CollaborationRoleNameEditPartCN(view);

+

+			case CollaborationUseEditPartCN.VISUAL_ID:

+				return new CollaborationUseEditPartCN(view);

+

+			case CollaborationUseNameEditPart.VISUAL_ID:

+				return new CollaborationUseNameEditPart(view);

+

+			case ActivityCompositeEditPartCN.VISUAL_ID:

+				return new ActivityCompositeEditPartCN(view);

+

+			case ActivityCompositeNameEditPartCN.VISUAL_ID:

+				return new ActivityCompositeNameEditPartCN(view);

+

+			case InteractionCompositeEditPartCN.VISUAL_ID:

+				return new InteractionCompositeEditPartCN(view);

+

+			case InteractionCompositeNameEditPartCN.VISUAL_ID:

+				return new InteractionCompositeNameEditPartCN(view);

+

+			case ProtocolStateMachineCompositeEditPartCN.VISUAL_ID:

+				return new ProtocolStateMachineCompositeEditPartCN(view);

+

+			case ProtocolStateMachineCompositeNameEditPartCN.VISUAL_ID:

+				return new ProtocolStateMachineCompositeNameEditPartCN(view);

+

+			case StateMachineCompositeEditPartCN.VISUAL_ID:

+				return new StateMachineCompositeEditPartCN(view);

+

+			case StateMachineCompositeNameEditPartCN.VISUAL_ID:

+				return new StateMachineCompositeNameEditPartCN(view);

+

+			case FunctionBehaviorCompositeEditPartCN.VISUAL_ID:

+				return new FunctionBehaviorCompositeEditPartCN(view);

+

+			case FunctionBehaviorCompositeNameEditPartCN.VISUAL_ID:

+				return new FunctionBehaviorCompositeNameEditPartCN(view);

+

+			case OpaqueBehaviorCompositeEditPartCN.VISUAL_ID:

+				return new OpaqueBehaviorCompositeEditPartCN(view);

+

+			case OpaqueBehaviorCompositeNameEditPartCN.VISUAL_ID:

+				return new OpaqueBehaviorCompositeNameEditPartCN(view);

+

+			case ComponentCompositeEditPartCN.VISUAL_ID:

+				return new ComponentCompositeEditPartCN(view);

+

+			case ComponentCompositeNameEditPartCN.VISUAL_ID:

+				return new ComponentCompositeNameEditPartCN(view);

+

+			case DeviceCompositeEditPartCN.VISUAL_ID:

+				return new DeviceCompositeEditPartCN(view);

+

+			case DeviceCompositeNameEditPartCN.VISUAL_ID:

+				return new DeviceCompositeNameEditPartCN(view);

+

+			case ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID:

+				return new ExecutionEnvironmentCompositeEditPartCN(view);

+

+			case ExecutionEnvironmentCompositeNameEditPartCN.VISUAL_ID:

+				return new ExecutionEnvironmentCompositeNameEditPartCN(view);

+

+			case NodeCompositeEditPartCN.VISUAL_ID:

+				return new NodeCompositeEditPartCN(view);

+

+			case NodeCompositeNameEditPartCN.VISUAL_ID:

+				return new NodeCompositeNameEditPartCN(view);

+

+			case ClassCompositeEditPartCN.VISUAL_ID:

+				return new ClassCompositeEditPartCN(view);

+

+			case ClassCompositeNameEditPartCN.VISUAL_ID:

+				return new ClassCompositeNameEditPartCN(view);

+

+			case CollaborationCompositeEditPartCN.VISUAL_ID:

+				return new CollaborationCompositeEditPartCN(view);

+

+			case CollaborationCompositeNameEditPartCN.VISUAL_ID:

+				return new CollaborationCompositeNameEditPartCN(view);

+

+			case InterfaceEditPartCN.VISUAL_ID:

+				return new InterfaceEditPartCN(view);

+

+			case InterfaceNameEditPartCN.VISUAL_ID:

+				return new InterfaceNameEditPartCN(view);

+

+			case PrimitiveTypeEditPartCN.VISUAL_ID:

+				return new PrimitiveTypeEditPartCN(view);

+

+			case PrimitiveTypeNameEditPartCN.VISUAL_ID:

+				return new PrimitiveTypeNameEditPartCN(view);

+

+			case EnumerationEditPartCN.VISUAL_ID:

+				return new EnumerationEditPartCN(view);

+

+			case EnumerationNameEditPartCN.VISUAL_ID:

+				return new EnumerationNameEditPartCN(view);

+

+			case DataTypeEditPartCN.VISUAL_ID:

+				return new DataTypeEditPartCN(view);

+

+			case DataTypeNameEditPartCN.VISUAL_ID:

+				return new DataTypeNameEditPartCN(view);

+

+			case ActorEditPartCN.VISUAL_ID:

+				return new ActorEditPartCN(view);

+

+			case ActorNameEditPartCN.VISUAL_ID:

+				return new ActorNameEditPartCN(view);

+

+			case DeploymentSpecificationEditPartCN.VISUAL_ID:

+				return new DeploymentSpecificationEditPartCN(view);

+

+			case DeploymentSpecificationNameEditPartCN.VISUAL_ID:

+				return new DeploymentSpecificationNameEditPartCN(view);

+

+			case ArtifactEditPartCN.VISUAL_ID:

+				return new ArtifactEditPartCN(view);

+

+			case ArtifactNameEditPartCN.VISUAL_ID:

+				return new ArtifactNameEditPartCN(view);

+

+			case InformationItemEditPartCN.VISUAL_ID:

+				return new InformationItemEditPartCN(view);

+

+			case InformationItemNameEditPartCN.VISUAL_ID:

+				return new InformationItemNameEditPartCN(view);

+

+			case SignalEditPartCN.VISUAL_ID:

+				return new SignalEditPartCN(view);

+

+			case SignalNameEditPartCN.VISUAL_ID:

+				return new SignalNameEditPartCN(view);

+

+			case UseCaseEditPartCN.VISUAL_ID:

+				return new UseCaseEditPartCN(view);

+

+			case UseCaseNameEditPartCN.VISUAL_ID:

+				return new UseCaseNameEditPartCN(view);

+

+			case CommentEditPartCN.VISUAL_ID:

+				return new CommentEditPartCN(view);

+

+			case CommentBodyEditPartCN.VISUAL_ID:

+				return new CommentBodyEditPartCN(view);

+

+			case DurationConstraintEditPartCN.VISUAL_ID:

+				return new DurationConstraintEditPartCN(view);

+

+			case DurationConstraintNameEditPartCN.VISUAL_ID:

+				return new DurationConstraintNameEditPartCN(view);

+

+			case DurationConstraintSpecificationEditPartCN.VISUAL_ID:

+				return new DurationConstraintSpecificationEditPartCN(view);

+

+			case TimeConstraintEditPartCN.VISUAL_ID:

+				return new TimeConstraintEditPartCN(view);

+

+			case TimeConstraintNameEditPartCN.VISUAL_ID:

+				return new TimeConstraintNameEditPartCN(view);

+

+			case TimeConstraintSpecificationEditPartCN.VISUAL_ID:

+				return new TimeConstraintSpecificationEditPartCN(view);

+

+			case IntervalConstraintEditPartCN.VISUAL_ID:

+				return new IntervalConstraintEditPartCN(view);

+

+			case IntervalConstraintNameEditPartCN.VISUAL_ID:

+				return new IntervalConstraintNameEditPartCN(view);

+

+			case IntervalConstraintSpecificationEditPartCN.VISUAL_ID:

+				return new IntervalConstraintSpecificationEditPartCN(view);

+

+			case InteractionConstraintEditPartCN.VISUAL_ID:

+				return new InteractionConstraintEditPartCN(view);

+

+			case InteractionConstraintNameEditPartCN.VISUAL_ID:

+				return new InteractionConstraintNameEditPartCN(view);

+

+			case InteractionConstraintSpecificationEditPartCN.VISUAL_ID:

+				return new InteractionConstraintSpecificationEditPartCN(view);

+

+			case ConstraintEditPartCN.VISUAL_ID:

+				return new ConstraintEditPartCN(view);

+

+			case ConstraintNameEditPartCN.VISUAL_ID:

+				return new ConstraintNameEditPartCN(view);

+

+			case ConstraintSpecificationEditPartCN.VISUAL_ID:

+				return new ConstraintSpecificationEditPartCN(view);

+

+			case PropertyEditPartCLN.VISUAL_ID:

+				return new PropertyEditPartCLN(view);

+

+			case OperationEditPartCLN.VISUAL_ID:

+				return new OperationEditPartCLN(view);

+

+			case EnumerationLiteralEditPartCLN.VISUAL_ID:

+				return new EnumerationLiteralEditPartCLN(view);

+

+			case DataTypeAttributeCompartmentEditPart.VISUAL_ID:

+				return new DataTypeAttributeCompartmentEditPart(view);

+

+			case DataTypeOperationCompartmentEditPart.VISUAL_ID:

+				return new DataTypeOperationCompartmentEditPart(view);

+

+			case DataTypeAttributeCompartmentEditPartCN.VISUAL_ID:

+				return new DataTypeAttributeCompartmentEditPartCN(view);

+

+			case DataTypeOperationCompartmentEditPartCN.VISUAL_ID:

+				return new DataTypeOperationCompartmentEditPartCN(view);

+

+			case EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID:

+				return new EnumerationEnumerationLiteralCompartmentEditPart(view);

+

+			case EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID:

+				return new EnumerationEnumerationLiteralCompartmentEditPartCN(view);

+

+			case ActivityCompositeCompartmentEditPartCN.VISUAL_ID:

+				return new ActivityCompositeCompartmentEditPartCN(view);

+

+			case InteractionCompositeCompartmentEditPartCN.VISUAL_ID:

+				return new InteractionCompositeCompartmentEditPartCN(view);

+

+			case ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID:

+				return new ProtocolStateMachineCompositeCompartmentEditPartCN(view);

+

+			case StateMachineCompositeCompartmentEditPartCN.VISUAL_ID:

+				return new StateMachineCompositeCompartmentEditPartCN(view);

+

+			case FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:

+				return new FunctionBehaviorCompositeCompartmentEditPartCN(view);

+

+			case OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:

+				return new OpaqueBehaviorCompositeCompartmentEditPartCN(view);

+

+			case ComponentCompositeCompartmentEditPartCN.VISUAL_ID:

+				return new ComponentCompositeCompartmentEditPartCN(view);

+

+			case DeviceCompositeCompartmentEditPartCN.VISUAL_ID:

+				return new DeviceCompositeCompartmentEditPartCN(view);

+

+			case ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID:

+				return new ExecutionEnvironmentCompositeCompartmentEditPartCN(view);

+

+			case NodeCompositeCompartmentEditPartCN.VISUAL_ID:

+				return new NodeCompositeCompartmentEditPartCN(view);

+

+			case ClassCompositeCompartmentEditPartCN.VISUAL_ID:

+				return new ClassCompositeCompartmentEditPartCN(view);

+

+			case CollaborationCompositeCompartmentEditPartCN.VISUAL_ID:

+				return new CollaborationCompositeCompartmentEditPartCN(view);

+

+			case ActivityCompositeCompartmentEditPart.VISUAL_ID:

+				return new ActivityCompositeCompartmentEditPart(view);

+

+			case InteractionCompositeCompartmentEditPart.VISUAL_ID:

+				return new InteractionCompositeCompartmentEditPart(view);

+

+			case ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID:

+				return new ProtocolStateMachineCompositeCompartmentEditPart(view);

+

+			case StateMachineCompositeCompartmentEditPart.VISUAL_ID:

+				return new StateMachineCompositeCompartmentEditPart(view);

+

+			case FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID:

+				return new FunctionBehaviorCompositeCompartmentEditPart(view);

+

+			case OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID:

+				return new OpaqueBehaviorCompositeCompartmentEditPart(view);

+

+			case ComponentCompositeCompartmentEditPart.VISUAL_ID:

+				return new ComponentCompositeCompartmentEditPart(view);

+

+			case DeviceCompositeCompartmentEditPart.VISUAL_ID:

+				return new DeviceCompositeCompartmentEditPart(view);

+

+			case ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID:

+				return new ExecutionEnvironmentCompositeCompartmentEditPart(view);

+

+			case NodeCompositeCompartmentEditPart.VISUAL_ID:

+				return new NodeCompositeCompartmentEditPart(view);

+

+			case ClassCompositeCompartmentEditPart.VISUAL_ID:

+				return new ClassCompositeCompartmentEditPart(view);

+

+			case CollaborationCompositeCompartmentEditPart.VISUAL_ID:

+				return new CollaborationCompositeCompartmentEditPart(view);

+

+			case PropertyPartCompartmentEditPartCN.VISUAL_ID:

+				return new PropertyPartCompartmentEditPartCN(view);

+

+			case BehaviorPortLinkEditPart.VISUAL_ID:

+				return new BehaviorPortLinkEditPart(view);

+

+

+			case LinkDescriptorEditPart.VISUAL_ID:

+				return new LinkDescriptorEditPart(view);

+

+

+			case CommentAnnotatedElementEditPart.VISUAL_ID:

+				return new CommentAnnotatedElementEditPart(view);

+

+

+			case ConstraintConstrainedElementEditPart.VISUAL_ID:

+				return new ConstraintConstrainedElementEditPart(view);

+

+

+			case ComponentRealizationEditPart.VISUAL_ID:

+				return new ComponentRealizationEditPart(view);

+

+			case ComponentRealizationNameEditPart.VISUAL_ID:

+				return new ComponentRealizationNameEditPart(view);

+

+			case ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID:

+				return new ComponentRealizationAppliedStereotypeEditPart(view);

+

+

+			case InterfaceRealizationEditPart.VISUAL_ID:

+				return new InterfaceRealizationEditPart(view);

+

+			case InterfaceRealizationNameEditPart.VISUAL_ID:

+				return new InterfaceRealizationNameEditPart(view);

+

+			case InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID:

+				return new InterfaceRealizationAppliedStereotypeEditPart(view);

+

+

+			case SubstitutionEditPart.VISUAL_ID:

+				return new SubstitutionEditPart(view);

+

+			case SubstitutionNameEditPart.VISUAL_ID:

+				return new SubstitutionNameEditPart(view);

+

+			case SubstitutionAppliedStereotypeEditPart.VISUAL_ID:

+				return new SubstitutionAppliedStereotypeEditPart(view);

+

+

+			case RealizationEditPart.VISUAL_ID:

+				return new RealizationEditPart(view);

+

+			case RealizationNameEditPart.VISUAL_ID:

+				return new RealizationNameEditPart(view);

+

+			case RealizationAppliedStereotypeEditPart.VISUAL_ID:

+				return new RealizationAppliedStereotypeEditPart(view);

+

+

+			case ManifestationEditPart.VISUAL_ID:

+				return new ManifestationEditPart(view);

+

+			case ManifestationNameEditPart.VISUAL_ID:

+				return new ManifestationNameEditPart(view);

+

+			case ManifestationAppliedStereotypeEditPart.VISUAL_ID:

+				return new ManifestationAppliedStereotypeEditPart(view);

+

+

+			case AbstractionEditPart.VISUAL_ID:

+				return new AbstractionEditPart(view);

+

+			case AbstractionNameEditPart.VISUAL_ID:

+				return new AbstractionNameEditPart(view);

+

+			case AbstractionAppliedStereotypeEditPart.VISUAL_ID:

+				return new AbstractionAppliedStereotypeEditPart(view);

+

+

+			case UsageEditPart.VISUAL_ID:

+				return new UsageEditPart(view);

+

+			case UsageNameEditPart.VISUAL_ID:

+				return new UsageNameEditPart(view);

+

+			case UsageAppliedStereotypeEditPart.VISUAL_ID:

+				return new UsageAppliedStereotypeEditPart(view);

+

+

+			case DeploymentEditPart.VISUAL_ID:

+				return new DeploymentEditPart(view);

+

+			case DeploymentNameEditPart.VISUAL_ID:

+				return new DeploymentNameEditPart(view);

+

+			case DeploymentAppliedStereotypeEditPart.VISUAL_ID:

+				return new DeploymentAppliedStereotypeEditPart(view);

+

+

+			case RoleBindingEditPart.VISUAL_ID:

+				return new RoleBindingEditPart(view);

+

+			case RoleBindingRoleNameEditPart.VISUAL_ID:

+				return new RoleBindingRoleNameEditPart(view);

+

+			case RoleBindingAppliedStereotypeEditPart.VISUAL_ID:

+				return new RoleBindingAppliedStereotypeEditPart(view);

+

+

+			case DependencyEditPart.VISUAL_ID:

+				return new DependencyEditPart(view);

+

+			case DependencyNameEditPart.VISUAL_ID:

+				return new DependencyNameEditPart(view);

+

+			case DependencyAppliedStereotypeEditPart.VISUAL_ID:

+				return new DependencyAppliedStereotypeEditPart(view);

+

+

+			case ConnectorEditPart.VISUAL_ID:

+				return new ConnectorEditPart(view);

+

+			case ConnectorAppliedStereotypeEditPart.VISUAL_ID:

+				return new ConnectorAppliedStereotypeEditPart(view);

+

+			case ConnectorNameEditPart.VISUAL_ID:

+				return new ConnectorNameEditPart(view);

+

+			case ConnectorMultiplicitySourceEditPart.VISUAL_ID:

+				return new ConnectorMultiplicitySourceEditPart(view);

+

+			case ConnectorMultiplicityTargetEditPart.VISUAL_ID:

+				return new ConnectorMultiplicityTargetEditPart(view);

+

+

+			case GeneralizationEditPart.VISUAL_ID:

+				return new GeneralizationEditPart(view);

+

+			case GeneralizationAppliedStereotypeEditPart.VISUAL_ID:

+				return new GeneralizationAppliedStereotypeEditPart(view);

+

+

+			case TimeObservationEventEditPart.VISUAL_ID:

+				return new TimeObservationEventEditPart(view);

+

+

+			case DurationObservationEventEditPart.VISUAL_ID:

+				return new DurationObservationEventEditPart(view);

+

+

+			case RepresentationEditPart.VISUAL_ID:

+				return new RepresentationEditPart(view);

+

+			case RepresentationTagLabelEditPart.VISUAL_ID:

+				return new RepresentationTagLabelEditPart(view);

+

+

+			case InformationFlowEditPart.VISUAL_ID:

+				return new InformationFlowEditPart(view);

+

+			case InformationFlowConveyedLabelEditPart.VISUAL_ID:

+				return new InformationFlowConveyedLabelEditPart(view);

+

+			case InformationFlowAppliedStereotypeEditPart.VISUAL_ID:

+				return new InformationFlowAppliedStereotypeEditPart(view);

+

+			}

+		}

+		return createUnrecognizedEditPart(context, model);

+	}

+

+	/**

+	 * @generated

+	 */

+	private EditPart createUnrecognizedEditPart(EditPart context, Object model) {

+		// Handle creation of unrecognized child node EditParts here

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static CellEditorLocator getTextCellEditorLocator(ITextAwareEditPart source) {

+		if(source.getFigure() instanceof IMultilineEditableFigure) {

+			return new MultilineCellEditorLocator((IMultilineEditableFigure)source.getFigure());

+		} else {

+			return CellEditorLocatorAccess.INSTANCE.getTextCellEditorLocator(source);

+

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	static private class MultilineCellEditorLocator implements CellEditorLocator {

+

+		/**

+		 * @generated

+		 */

+		private IMultilineEditableFigure multilineEditableFigure;

+

+		/**

+		 * @generated

+		 */

+		public MultilineCellEditorLocator(IMultilineEditableFigure figure) {

+			this.multilineEditableFigure = figure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public IMultilineEditableFigure getMultilineEditableFigure() {

+			return multilineEditableFigure;

+		}

+

+		/**

+		 * @generated

+		 */

+		public void relocate(CellEditor celleditor) {

+			Text text = (Text)celleditor.getControl();

+			Rectangle rect = getMultilineEditableFigure().getBounds().getCopy();

+			rect.x = getMultilineEditableFigure().getEditionLocation().x;

+			rect.y = getMultilineEditableFigure().getEditionLocation().y;

+			getMultilineEditableFigure().translateToAbsolute(rect);

+			if(getMultilineEditableFigure().getText().length() > 0) {

+				rect.setSize(new Dimension(text.computeSize(rect.width, SWT.DEFAULT)));

+			}

+			if(!rect.equals(new Rectangle(text.getBounds()))) {

+				text.setBounds(rect.x, rect.y, rect.width, rect.height);

+			}

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageAppliedStereotypeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageAppliedStereotypeEditPart.java
index a2ce608d88e..4570028f32d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageAppliedStereotypeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageAppliedStereotypeEditPart.java
@@ -1,759 +1,752 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6021;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));
-	}
-
-	/**
-	 * @generated
-	 */
-	public UsageAppliedStereotypeEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Usage_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageAppliedStereotypeEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		// The label is read-only (defined in GMFGen model)
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class UsageAppliedStereotypeEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6021;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageAppliedStereotypeEditPart.VISUAL_ID), new Point(0, 30));

+	}

+

+	/**

+	 * @generated

+	 */

+	public UsageAppliedStereotypeEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Usage_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageAppliedStereotypeEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		// The label is read-only (defined in GMFGen model)

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageEditPart.java
index b5959342277..394b4f6ad5e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageEditPart.java
@@ -1,120 +1,115 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeUsageLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UsageItemSemanticEditPolicy;
-
-/**
- * @generated
- */
-public class UsageEditPart extends UMLConnectionNodeEditPart
-		implements ITreeBranchEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 4008;
-
-	/**
-	 * @generated
-	 */
-	public UsageEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new UsageItemSemanticEditPolicy());
-		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeUsageLabelDisplayEditPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof UsageNameEditPart) {
-			((UsageNameEditPart) childEditPart).setLabel(
-					getPrimaryShape().getNameLabel());
-			return true;
-		}
-		if (childEditPart instanceof UsageAppliedStereotypeEditPart) {
-			((UsageAppliedStereotypeEditPart) childEditPart).setLabel(
-					getPrimaryShape().getAppliedStereotypeLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof UsageNameEditPart) {
-			return true;
-		}
-		if (childEditPart instanceof UsageAppliedStereotypeEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected Connection createConnectionFigure() {
-		return new DashedEdgeFigure();
-	}
-
-	/**
-	 * @generated
-	 */
-	public DashedEdgeFigure getPrimaryShape() {
-		return (DashedEdgeFigure) getFigure();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.Connection;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.common.editparts.UMLConnectionNodeEditPart;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLinkLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeUsageLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.edge.DashedEdgeFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UsageItemSemanticEditPolicy;

+

+/**

+ * @generated

+ */

+public class UsageEditPart extends UMLConnectionNodeEditPart implements ITreeBranchEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 4008;

+

+	/**

+	 * @generated

+	 */

+	public UsageEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new UsageItemSemanticEditPolicy());

+		installEditPolicy(AppliedStereotypeLinkLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeUsageLabelDisplayEditPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof UsageNameEditPart) {

+			((UsageNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+		}

+		if(childEditPart instanceof UsageAppliedStereotypeEditPart) {

+			((UsageAppliedStereotypeEditPart)childEditPart).setLabel(getPrimaryShape().getAppliedStereotypeLabel());

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof UsageNameEditPart) {

+			return true;

+		}

+		if(childEditPart instanceof UsageAppliedStereotypeEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected Connection createConnectionFigure() {

+		return new DashedEdgeFigure();

+	}

+

+	/**

+	 * @generated

+	 */

+	public DashedEdgeFigure getPrimaryShape() {

+		return (DashedEdgeFigure)getFigure();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageNameEditPart.java
index 2dcdb6c5214..62c44dfeb08 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UsageNameEditPart.java
@@ -1,766 +1,760 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 6007;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-	/**
-	 * @generated
-	 */
-	static {
-		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageNameEditPart.VISUAL_ID), new Point(0, 60));
-	}
-
-	/**
-	 * @generated
-	 */
-	public UsageNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	public int getKeyPoint() {
-		return ConnectionLocator.MIDDLE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.Usage_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return getPrimaryView();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ConnectionLocator;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class UsageNameEditPart extends PapyrusLabelEditPart implements ITextAwareEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 6007;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+	/**

+	 * @generated

+	 */

+	static {

+		registerSnapBackPosition(UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageNameEditPart.VISUAL_ID), new Point(0, 60));

+	}

+

+	/**

+	 * @generated

+	 */

+	public UsageNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultLinkLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	public int getKeyPoint() {

+		return ConnectionLocator.MIDDLE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.Usage_4008, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPart.java
index 8368e55866e..e4d38119a17 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPart.java
@@ -1,241 +1,250 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UseCaseItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class UseCaseEditPart extends NodeEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 2082;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public UseCaseEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new UseCaseItemSemanticEditPolicy());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeNamedElementFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 * @generated
-	 */
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof UseCaseNameEditPart) {
-			((UseCaseNameEditPart) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof UseCaseNameEditPart) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(UseCaseNameEditPart.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UseCaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class UseCaseEditPart extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 2082;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public UseCaseEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new UseCaseItemSemanticEditPolicy());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeNamedElementFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 * 

+	 * @generated

+	 */

+	public NodeNamedElementFigure getPrimaryShape() {

+		return (NodeNamedElementFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof UseCaseNameEditPart) {

+			((UseCaseNameEditPart)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof UseCaseNameEditPart) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(UseCaseNameEditPart.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPartCN.java
index 20d57b55f5d..4f852647e3e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseEditPartCN.java
@@ -1,241 +1,250 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.LayoutEditPolicy;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
-import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;
-import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UseCaseItemSemanticEditPolicyCN;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @generated
- */
-public class UseCaseEditPartCN extends NodeEditPart
-{
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 3096;
-	/**
-	 * @generated
-	 */
-	protected IFigure contentPane;
-	/**
-	 * @generated
-	 */
-	protected IFigure primaryShape;
-
-	/**
-	 * @generated
-	 */
-	public UseCaseEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new UseCaseItemSemanticEditPolicyCN());
-		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());
-		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());
-		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());
-		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected LayoutEditPolicy createLayoutEditPolicy() {
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected EditPolicy createChildEditPolicy(EditPart child) {
-				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected Command getMoveChildrenCommand(Request request) {
-				return null;
-			}
-
-			protected Command getCreateCommand(CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createNodeShape() {
-		return primaryShape = new NodeNamedElementFigure();
-	}
-
-	/**
-	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure
-	 * @generated
-	 */
-	public NodeNamedElementFigure getPrimaryShape() {
-		return (NodeNamedElementFigure) primaryShape;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean addFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof UseCaseNameEditPartCN) {
-			((UseCaseNameEditPartCN) childEditPart).setLabel(getPrimaryShape().getNameLabel());
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean removeFixedChild(EditPart childEditPart) {
-		if (childEditPart instanceof UseCaseNameEditPartCN) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addChildVisual(EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeChildVisual(EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {
-		return getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected NodeFigure createNodePlate() {
-		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);
-		return result;
-	}
-
-	/**
-	 * Creates figure for this edit part.
-	 * 
-	 * Body of this method does not depend on settings in generation model
-	 * so you may safely remove <i>generated</i> tag and modify it.
-	 * 
-	 * @generated
-	 */
-	protected NodeFigure createNodeFigure() {
-		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());
-	}
-
-	/**
-	 * Default implementation treats passed figure as content pane.
-	 * Respects layout one may have set for generated figure.
-	 * @param nodeShape instance of generated figure class
-	 * @generated
-	 */
-	protected IFigure setupContentPane(IFigure nodeShape) {
-		if (nodeShape.getLayoutManager() == null) {
-			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
-			layout.setSpacing(5);
-			nodeShape.setLayoutManager(layout);
-		}
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-
-	/**
-	 * @generated
-	 */
-	public IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setForegroundColor(Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineWidth(int width) {
-		super.setLineWidth(width);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLineType(int style) {
-		if (primaryShape instanceof NodeFigure) {
-			((NodeFigure) primaryShape).setLineStyle(style);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public EditPart getPrimaryChildEditPart() {
-		return getChildBySemanticHint(UMLVisualIDRegistry.getType(UseCaseNameEditPartCN.VISUAL_ID));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.editpolicies.LayoutEditPolicy;

+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;

+import org.eclipse.gef.requests.CreateRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;

+import org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure;

+import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SelectableBorderedNodeFigure;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.AppliedStereotypeNodeLabelDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.QualifiedNameDisplayEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure;

+import org.eclipse.papyrus.uml.diagram.composite.custom.edit.policies.CustomGraphicalNodeEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UseCaseItemSemanticEditPolicyCN;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.graphics.Color;

+

+/**

+ * @generated

+ */

+public class UseCaseEditPartCN extends NodeEditPart {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 3096;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure contentPane;

+

+	/**

+	 * @generated

+	 */

+	protected IFigure primaryShape;

+

+	/**

+	 * @generated

+	 */

+	public UseCaseEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new UseCaseItemSemanticEditPolicyCN());

+		installEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());

+		installEditPolicy(QualifiedNameDisplayEditPolicy.QUALIFIED_NAME_POLICY, new QualifiedNameDisplayEditPolicy());

+		installEditPolicy(AppliedStereotypeLabelDisplayEditPolicy.STEREOTYPE_LABEL_POLICY, new AppliedStereotypeNodeLabelDisplayEditPolicy());

+		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new CustomGraphicalNodeEditPolicy());

+		// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies

+		// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected LayoutEditPolicy createLayoutEditPolicy() {

+		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {

+

+			protected EditPolicy createChildEditPolicy(EditPart child) {

+				EditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+				if(result == null) {

+					result = new NonResizableEditPolicy();

+				}

+				return result;

+			}

+

+			protected Command getMoveChildrenCommand(Request request) {

+				return null;

+			}

+

+			protected Command getCreateCommand(CreateRequest request) {

+				return null;

+			}

+		};

+		return lep;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createNodeShape() {

+		return primaryShape = new NodeNamedElementFigure();

+	}

+

+	/**

+	 * org.eclipse.papyrus.uml.diagram.common.figure.node.NodeNamedElementFigure

+	 * 

+	 * @generated

+	 */

+	public NodeNamedElementFigure getPrimaryShape() {

+		return (NodeNamedElementFigure)primaryShape;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean addFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof UseCaseNameEditPartCN) {

+			((UseCaseNameEditPartCN)childEditPart).setLabel(getPrimaryShape().getNameLabel());

+			return true;

+		}

+

+

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean removeFixedChild(EditPart childEditPart) {

+		if(childEditPart instanceof UseCaseNameEditPartCN) {

+			return true;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addChildVisual(EditPart childEditPart, int index) {

+		if(addFixedChild(childEditPart)) {

+			return;

+		}

+		super.addChildVisual(childEditPart, -1);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeChildVisual(EditPart childEditPart) {

+		if(removeFixedChild(childEditPart)) {

+			return;

+		}

+		super.removeChildVisual(childEditPart);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure getContentPaneFor(IGraphicalEditPart editPart) {

+		return getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected NodeFigure createNodePlate() {

+		DefaultSizeNodeFigure result = new DefaultSizeNodeFigure(40, 40);

+		return result;

+	}

+

+	/**

+	 * Creates figure for this edit part.

+	 * 

+	 * Body of this method does not depend on settings in generation model

+	 * so you may safely remove <i>generated</i> tag and modify it.

+	 * 

+	 * @generated

+	 */

+	protected NodeFigure createNodeFigure() {

+		return new SelectableBorderedNodeFigure(createMainFigureWithSVG());

+

+	}

+

+	/**

+	 * Default implementation treats passed figure as content pane.

+	 * Respects layout one may have set for generated figure.

+	 * 

+	 * @param nodeShape

+	 *        instance of generated figure class

+	 * @generated

+	 */

+	protected IFigure setupContentPane(IFigure nodeShape) {

+		if(nodeShape.getLayoutManager() == null) {

+			ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();

+			layout.setSpacing(5);

+			nodeShape.setLayoutManager(layout);

+		}

+		return nodeShape; // use nodeShape itself as contentPane

+	}

+

+	/**

+	 * @generated

+	 */

+	public IFigure getContentPane() {

+		if(contentPane != null) {

+			return contentPane;

+		}

+		return super.getContentPane();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setForegroundColor(Color color) {

+		if(primaryShape != null) {

+			primaryShape.setForegroundColor(color);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineWidth(int width) {

+		super.setLineWidth(width);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLineType(int style) {

+		if(primaryShape instanceof NodeFigure) {

+			((NodeFigure)primaryShape).setLineStyle(style);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public EditPart getPrimaryChildEditPart() {

+		return getChildBySemanticHint(UMLVisualIDRegistry.getType(UseCaseNameEditPartCN.VISUAL_ID));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPart.java
index 9408e50d235..b7f35cf8c46 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPart.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5165;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public UseCaseNameEditPart(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.UseCase_2082, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UseCaseNameEditPart.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class UseCaseNameEditPart extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5165;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public UseCaseNameEditPart(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.UseCase_2082, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UseCaseNameEditPart.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPartCN.java
index 811ef2736f9..89f84014f6a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPartCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/UseCaseNameEditPartCN.java
@@ -1,821 +1,818 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.parts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.RecordingCommand;
-import org.eclipse.emf.transaction.RunnableWithResult;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.AccessibleEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;
-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
-import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.papyrus.extensionpoints.editors.Activator;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
-import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;
-import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;
-import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;
-import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;
-import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;
-import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;
-import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;
-import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.uml2.uml.Feature;
-
-/**
- * @generated
- */
-public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {
-	/**
-	 * @generated
-	 */
-	public static final int VISUAL_ID = 5149;
-	/**
-	 * @generated
-	 */
-	private DirectEditManager manager;
-	/**
-	 * @generated
-	 */
-	private IParser parser;
-	/**
-	 * @generated
-	 */
-	private List<?> parserElements;
-	/**
-	 * @generated
-	 */
-	private String defaultText;
-	/**
-	 * direct edition mode (default, undefined, registered editor, etc.)
-	 * @generated
-	 */
-	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;
-	/**
-	 * configuration from a registered edit dialog
-	 * @generated
-	 */
-	protected IDirectEditorConfiguration configuration;
-
-	/**
-	 * @generated
-	 */
-	public UseCaseNameEditPartCN(View view) {
-		super(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void createDefaultEditPolicies() {
-		super.createDefaultEditPolicies();
-		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());
-		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());
-		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelTextHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getText();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getText();
-		} else {
-			return ((Label) figure).getText();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelTextHelper(IFigure figure, String text) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setText(text);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setText(text);
-		} else {
-			((Label) figure).setText(text);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIconHelper(IFigure figure) {
-		if (figure instanceof WrappingLabel) {
-			return ((WrappingLabel) figure).getIcon();
-		} else if (figure instanceof ILabelFigure) {
-			return ((ILabelFigure) figure).getIcon();
-		} else {
-			return ((Label) figure).getIcon();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setLabelIconHelper(IFigure figure, Image icon) {
-		if (figure instanceof WrappingLabel) {
-			((WrappingLabel) figure).setIcon(icon);
-		} else if (figure instanceof ILabelFigure) {
-			((ILabelFigure) figure).setIcon(icon);
-		} else {
-			((Label) figure).setIcon(icon);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabel(IFigure
-			figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> getModelChildren() {
-		return Collections.EMPTY_LIST;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setParser(IParser parser) {
-		this.parser = parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getParserElement() {
-		return resolveSemanticElement();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Image getLabelIcon() {
-		EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());
-		for (View view : views) {
-			if (AppearanceHelper.showElementIcon(view)) {
-				return UMLElementTypes.getImage(parserElement.eClass());
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getLabelText() {
-		String text = null;
-		EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-					new EObjectAdapter(parserElement),
-					getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; //$NON-NLS-1$
-		}
-		return getParser().getEditString(
-				new EObjectAdapter(getParserElement()),
-				getParserOptions().intValue());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean isEditable() {
-		return getParser() != null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICellEditorValidator getEditTextValidator() {
-		return new ICellEditorValidator() {
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final EObject element = getParserElement();
-					final IParser parser = getParser();
-					try {
-						IParserEditStatus valid =
-								(IParserEditStatus) getEditingDomain().runExclusive(
-										new RunnableWithResult.Impl<java.lang.Object>() {
-											public void run() {
-												setResult(parser.isValidEditString(new EObjectAdapter(element), (String) value));
-											}
-										});
-						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	public IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));
-	}
-
-	/**
-	 * @generated
-	 */
-	public ParserOptions getParserOptions() {
-		return ParserOptions.NONE;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParser getParser() {
-		if (parser == null) {
-			parser = UMLParserProvider.getParser(UMLElementTypes.UseCase_3096, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UseCaseNameEditPartCN.VISUAL_ID));
-		}
-		return parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new MultilineLabelDirectEditManager(this,
-					MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-					UMLEditPartFactory.getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setManager(DirectEditManager manager) {
-		this.manager = manager;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit() {
-		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {
-			public void run() {
-				getManager().show();
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEdit(Point eventLocation) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof TextDirectEditManager) {
-			((TextDirectEditManager) getManager()).show(initialCharacter);
-		} else {
-			performDirectEdit();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performDirectEditRequest(Request request) {
-		final Request theRequest = request;
-		if (IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {
-			directEditionMode = getDirectEditionType();
-		}
-		switch (directEditionMode) {
-		case IDirectEdition.NO_DIRECT_EDITION:
-			// no direct edition mode => does nothing
-			return;
-		case IDirectEdition.EXTENDED_DIRECT_EDITOR:
-			updateExtendedEditorConfiguration();
-			if (configuration == null || configuration.getLanguage() == null) {
-				// Create default edit manager
-				setManager(new MultilineLabelDirectEditManager(this,
-						MultilineLabelDirectEditManager.getTextCellEditorClass(this),
-						UMLEditPartFactory.getTextCellEditorLocator(this)));
-				performDefaultDirectEditorEdit(theRequest);
-			} else {
-				configuration.preEditAction(resolveSemanticElement());
-				Dialog dialog = null;
-				if (configuration instanceof ICustomDirectEditorConfiguration) {
-					setManager(((ICustomDirectEditorConfiguration) configuration).createDirectEditManager(this));
-					initializeDirectEditManager(theRequest);
-					return;
-				} else if (configuration instanceof IPopupEditorConfiguration) {
-					IPopupEditorHelper helper = ((IPopupEditorConfiguration) configuration).createPopupEditorHelper(this);
-					helper.showEditor();
-					return;
-				}
-				else if (configuration instanceof IAdvancedEditorConfiguration) {
-					dialog = ((IAdvancedEditorConfiguration) configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));
-				} else if (configuration instanceof IDirectEditorConfiguration) {
-					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration) configuration).getTextToEdit(resolveSemanticElement()),
-							(IDirectEditorConfiguration) configuration);
-				} else {
-					return;
-				}
-				final Dialog finalDialog = dialog;
-				if (Window.OK == dialog.open()) {
-					TransactionalEditingDomain domain = getEditingDomain();
-					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {
-						@Override
-						protected void doExecute() {
-							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog) finalDialog).getValue());
-						}
-					};
-					domain.getCommandStack().execute(command);
-				}
-			}
-			break;
-		case IDirectEdition.DEFAULT_DIRECT_EDITOR:
-			initializeDirectEditManager(theRequest);
-			break;
-		default:
-			break;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void initializeDirectEditManager(final Request request) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (request.getExtendedData().get(
-								RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						}
-						else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshLabel() {
-		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);
-		if (maskLabelPolicy == null) {
-			setLabelTextHelper(getFigure(), getLabelText());
-			setLabelIconHelper(getFigure(), getLabelIcon());
-		}
-		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
-		if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) pdEditPolicy).refreshFeedback();
-		}
-		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);
-		if (sfEditPolicy instanceof UMLTextSelectionEditPolicy) {
-			((UMLTextSelectionEditPolicy) sfEditPolicy).refreshFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshUnderline() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-		if (resolveSemanticElement() instanceof Feature) {
-			if (((Feature) resolveSemanticElement()).isStatic()) {
-				((WrappingLabel) getFigure()).setTextUnderline(true);
-			}
-			else {
-				((WrappingLabel) getFigure()).setTextUnderline(false);
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshStrikeThrough() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFont() {
-		FontStyle style =
-				(FontStyle) getFontStyleOwnerView().getStyle(
-						NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			FontData fontData = new FontData(
-					style.getFontName(), style.getFontHeight(),
-					(style.isBold() ? SWT.BOLD : SWT.NORMAL) |
-							(style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setFontColor(Color color) {
-		getFigure().setForegroundColor(color);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addSemanticListeners() {
-		if (getParser() instanceof ISemanticParser) {
-			EObject element = resolveSemanticElement();
-			parserElements = ((ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (EObject) parserElements.get(i)); //$NON-NLS-1$
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeSemanticListeners() {
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-				public void getName(AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getFontStyleOwnerView() {
-		return (View) getModel();
-	}
-
-	/**
-	 * Returns the kind of associated editor for direct edition.
-	 * 
-	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition
-	 * @generated
-	 */
-	public int getDirectEditionType() {
-		if (checkExtendedEditor()) {
-			initExtendedEditorConfiguration();
-			return IDirectEdition.EXTENDED_DIRECT_EDITOR;
-		}
-		if (checkDefaultEdition()) {
-			return IDirectEdition.DEFAULT_DIRECT_EDITOR;
-		}
-		// not a named element. no specific editor => do nothing
-		return IDirectEdition.NO_DIRECT_EDITION;
-	}
-
-	/**
-	 * Checks if an extended editor is present.
-	 * 
-	 * @return <code>true</code> if an extended editor is present.
-	 * @generated
-	 */
-	protected boolean checkExtendedEditor() {
-		if (resolveSemanticElement() != null) {
-			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());
-		}
-		return false;
-	}
-
-	/**
-	 * Checks if a default direct edition is available
-	 * 
-	 * @return <code>true</code> if a default direct edition is available
-	 * @generated
-	 */
-	protected boolean checkDefaultEdition() {
-		return (getParser() != null);
-	}
-
-	/**
-	 * Initializes the extended editor configuration
-	 * @generated
-	 */
-	protected void initExtendedEditorConfiguration() {
-		if (configuration == null) {
-			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-			if (languagePreferred != null && !languagePreferred.equals("")) {
-				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());
-			} else {
-				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());
-			}
-		}
-	}
-
-	/**
-	 * Updates the preference configuration
-	 * @generated
-	 */
-	protected void updateExtendedEditorConfiguration() {
-		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(
-				IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());
-		if (languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {
-			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement()
-					.eClass().getInstanceClassName());
-		} else if (IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {
-			configuration = null;
-		}
-	}
-
-	/**
-	 * Performs the direct edit usually used by GMF editors.
-	 * @param theRequest the direct edit request that starts the direct edit system
-	 * @generated
-	 */
-	protected void performDefaultDirectEditorEdit(final Request theRequest) {
-		// initialize the direct edit manager
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-				public void run() {
-					if (isActive() && isEditable()) {
-						if (theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(
-									RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else if ((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							DirectEditRequest editRequest = (DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleNotificationEvent(Notification event) {
-		refreshLabel();
-		Object feature = event.getFeature();
-		if (NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-			Integer c = (Integer) event.getNewValue();
-			setFontColor(DiagramColorRegistry.getInstance().getColor(c));
-		} else if (NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-			refreshUnderline();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-			refreshStrikeThrough();
-		} else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-				NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-			refreshFont();
-		} else {
-			if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-				refreshLabel();
-			}
-			if (getParser() instanceof ISemanticParser) {
-				ISemanticParser modelParser =
-						(ISemanticParser) getParser();
-				if (modelParser.areSemanticElementsAffected(null, event)) {
-					removeSemanticListeners();
-					if (resolveSemanticElement() != null) {
-						addSemanticListeners();
-					}
-					refreshLabel();
-				}
-			}
-		}
-		if (event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation) event.getNewValue()).getSource())) {
-			refreshLabel();
-		}
-		super.handleNotificationEvent(event);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFigure() {
-		// Parent should assign one using setLabel() method
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static final String ADD_PARENT_MODEL = "AddParentModel";
-
-	/**
-	 * @generated
-	 */
-	public void activate() {
-		super.activate();
-		addOwnerElementListeners();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void addOwnerElementListeners() {
-		addListenerFilter(ADD_PARENT_MODEL, this, ((View) getParent().getModel())); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public void deactivate() {
-		removeOwnerElementListeners();
-		super.deactivate();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void removeOwnerElementListeners() {
-		removeListenerFilter(ADD_PARENT_MODEL);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.parts;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.RecordingCommand;

+import org.eclipse.emf.transaction.RunnableWithResult;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.AccessibleEditPart;

+import org.eclipse.gef.EditPolicy;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.requests.DirectEditRequest;

+import org.eclipse.gef.tools.DirectEditManager;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy;

+import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry;

+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

+import org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy;

+import org.eclipse.jface.dialogs.Dialog;

+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;

+import org.eclipse.jface.viewers.ICellEditorValidator;

+import org.eclipse.jface.window.Window;

+import org.eclipse.papyrus.extensionpoints.editors.Activator;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IAdvancedEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.configuration.IPopupEditorConfiguration;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ExtendedDirectEditionDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.ILabelEditorDialog;

+import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;

+import org.eclipse.papyrus.extensionpoints.editors.utils.DirectEditorsUtil;

+import org.eclipse.papyrus.extensionpoints.editors.utils.IDirectEditorsIds;

+import org.eclipse.papyrus.infra.emf.appearance.helper.AppearanceHelper;

+import org.eclipse.papyrus.infra.emf.appearance.helper.VisualInformationPapyrusConstants;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusCompartmentEditPart;

+import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IMaskManagedLabelEditPolicy;

+import org.eclipse.papyrus.uml.diagram.common.directedit.MultilineLabelDirectEditManager;

+import org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition;

+import org.eclipse.papyrus.uml.diagram.common.figure.node.ILabelFigure;

+import org.eclipse.papyrus.uml.diagram.common.util.DiagramEditPartsUtil;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLTextSelectionEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLParserProvider;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.accessibility.AccessibleEvent;

+import org.eclipse.swt.custom.BusyIndicator;

+import org.eclipse.swt.graphics.Color;

+import org.eclipse.swt.graphics.FontData;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.uml2.uml.Feature;

+

+/**

+ * @generated

+ */

+public class UseCaseNameEditPartCN extends PapyrusCompartmentEditPart implements ITextAwareEditPart, IControlParserForDirectEdit {

+

+	/**

+	 * @generated

+	 */

+	public static final int VISUAL_ID = 5149;

+

+	/**

+	 * @generated

+	 */

+	private DirectEditManager manager;

+

+	/**

+	 * @generated

+	 */

+	private IParser parser;

+

+	/**

+	 * @generated

+	 */

+	private List<?> parserElements;

+

+	/**

+	 * @generated

+	 */

+	private String defaultText;

+

+	/**

+	 * direct edition mode (default, undefined, registered editor, etc.)

+	 * 

+	 * @generated

+	 */

+	protected int directEditionMode = IDirectEdition.UNDEFINED_DIRECT_EDITOR;

+

+	/**

+	 * configuration from a registered edit dialog

+	 * 

+	 * @generated

+	 */

+	protected IDirectEditorConfiguration configuration;

+

+	/**

+	 * @generated

+	 */

+	public UseCaseNameEditPartCN(View view) {

+		super(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void createDefaultEditPolicies() {

+		super.createDefaultEditPolicies();

+		installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new UMLTextSelectionEditPolicy());

+		installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());

+		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DefaultNodeLabelDragPolicy());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelTextHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getText();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getText();

+		} else {

+			return ((Label)figure).getText();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelTextHelper(IFigure figure, String text) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setText(text);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setText(text);

+		} else {

+			((Label)figure).setText(text);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIconHelper(IFigure figure) {

+		if(figure instanceof WrappingLabel) {

+			return ((WrappingLabel)figure).getIcon();

+		} else if(figure instanceof ILabelFigure) {

+			return ((ILabelFigure)figure).getIcon();

+		} else {

+			return ((Label)figure).getIcon();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setLabelIconHelper(IFigure figure, Image icon) {

+		if(figure instanceof WrappingLabel) {

+			((WrappingLabel)figure).setIcon(icon);

+		} else if(figure instanceof ILabelFigure) {

+			((ILabelFigure)figure).setIcon(icon);

+		} else {

+			((Label)figure).setIcon(icon);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabel(IFigure figure) {

+		unregisterVisuals();

+		setFigure(figure);

+		defaultText = getLabelTextHelper(figure);

+		registerVisuals();

+		refreshVisuals();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> getModelChildren() {

+		return Collections.EMPTY_LIST;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IGraphicalEditPart getChildBySemanticHint(String semanticHint) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setParser(IParser parser) {

+		this.parser = parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getParserElement() {

+		return resolveSemanticElement();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Image getLabelIcon() {

+		EObject parserElement = getParserElement();

+		if(parserElement == null) {

+			return null;

+		}

+		List<View> views = DiagramEditPartsUtil.findViews(parserElement, getViewer());

+		for(View view : views) {

+			if(AppearanceHelper.showElementIcon(view)) {

+				return UMLElementTypes.getImage(parserElement.eClass());

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getLabelText() {

+		String text = null;

+		EObject parserElement = getParserElement();

+		if(parserElement != null && getParser() != null) {

+			text = getParser().getPrintString(new EObjectAdapter(parserElement), getParserOptions().intValue());

+		}

+		if(text == null || text.length() == 0) {

+			text = defaultText;

+		}

+		return text;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLabelText(String text) {

+		setLabelTextHelper(getFigure(), text);

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditText() {

+		if(getParserElement() == null || getParser() == null) {

+			return ""; //$NON-NLS-1$

+		}

+		return getParser().getEditString(new EObjectAdapter(getParserElement()), getParserOptions().intValue());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean isEditable() {

+		return getParser() != null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICellEditorValidator getEditTextValidator() {

+		return new ICellEditorValidator() {

+

+			public String isValid(final Object value) {

+				if(value instanceof String) {

+					final EObject element = getParserElement();

+					final IParser parser = getParser();

+					try {

+						IParserEditStatus valid = (IParserEditStatus)getEditingDomain().runExclusive(new RunnableWithResult.Impl<java.lang.Object>() {

+

+							public void run() {

+								setResult(parser.isValidEditString(new EObjectAdapter(element), (String)value));

+							}

+						});

+						return valid.getCode() == ParserEditStatus.EDITABLE ? null : valid.getMessage();

+					} catch (InterruptedException ie) {

+						ie.printStackTrace();

+					}

+				}

+

+				// shouldn't get here

+				return null;

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	public IContentAssistProcessor getCompletionProcessor() {

+		if(getParserElement() == null || getParser() == null) {

+			return null;

+		}

+		return getParser().getCompletionProcessor(new EObjectAdapter(getParserElement()));

+	}

+

+	/**

+	 * @generated

+	 */

+	public ParserOptions getParserOptions() {

+		return ParserOptions.NONE;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParser getParser() {

+		if(parser == null) {

+			parser = UMLParserProvider.getParser(UMLElementTypes.UseCase_3096, getParserElement(), UMLVisualIDRegistry.getType(org.eclipse.papyrus.uml.diagram.composite.edit.parts.UseCaseNameEditPartCN.VISUAL_ID));

+		}

+		return parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected DirectEditManager getManager() {

+		if(manager == null) {

+			setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+		}

+		return manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setManager(DirectEditManager manager) {

+		this.manager = manager;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit() {

+		BusyIndicator.showWhile(Display.getDefault(), new java.lang.Runnable() {

+

+			public void run() {

+				getManager().show();

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEdit(Point eventLocation) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(eventLocation.getSWTPoint());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void performDirectEdit(char initialCharacter) {

+		if(getManager() instanceof TextDirectEditManager) {

+			((TextDirectEditManager)getManager()).show(initialCharacter);

+		} else {

+			performDirectEdit();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performDirectEditRequest(Request request) {

+

+		final Request theRequest = request;

+

+		if(IDirectEdition.UNDEFINED_DIRECT_EDITOR == directEditionMode) {

+			directEditionMode = getDirectEditionType();

+		}

+		switch(directEditionMode) {

+		case IDirectEdition.NO_DIRECT_EDITION:

+			// no direct edition mode => does nothing

+			return;

+		case IDirectEdition.EXTENDED_DIRECT_EDITOR:

+			updateExtendedEditorConfiguration();

+			if(configuration == null || configuration.getLanguage() == null) {

+				// Create default edit manager

+				setManager(new MultilineLabelDirectEditManager(this, MultilineLabelDirectEditManager.getTextCellEditorClass(this), UMLEditPartFactory.getTextCellEditorLocator(this)));

+				performDefaultDirectEditorEdit(theRequest);

+			} else {

+				configuration.preEditAction(resolveSemanticElement());

+				Dialog dialog = null;

+				if(configuration instanceof ICustomDirectEditorConfiguration) {

+					setManager(((ICustomDirectEditorConfiguration)configuration).createDirectEditManager(this));

+					initializeDirectEditManager(theRequest);

+					return;

+				} else if(configuration instanceof IPopupEditorConfiguration) {

+					IPopupEditorHelper helper = ((IPopupEditorConfiguration)configuration).createPopupEditorHelper(this);

+					helper.showEditor();

+					return;

+				} else if(configuration instanceof IAdvancedEditorConfiguration) {

+					dialog = ((IAdvancedEditorConfiguration)configuration).createDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), configuration.getTextToEdit(resolveSemanticElement()));

+				} else if(configuration instanceof IDirectEditorConfiguration) {

+					dialog = new ExtendedDirectEditionDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), resolveSemanticElement(), ((IDirectEditorConfiguration)configuration).getTextToEdit(resolveSemanticElement()), (IDirectEditorConfiguration)configuration);

+				} else {

+					return;

+				}

+				final Dialog finalDialog = dialog;

+

+				if(Window.OK == dialog.open()) {

+					TransactionalEditingDomain domain = getEditingDomain();

+					RecordingCommand command = new RecordingCommand(domain, "Edit Label") {

+

+						@Override

+						protected void doExecute() {

+							configuration.postEditAction(resolveSemanticElement(), ((ILabelEditorDialog)finalDialog).getValue());

+

+						}

+					};

+					domain.getCommandStack().execute(command);

+				}

+			}

+			break;

+		case IDirectEdition.DEFAULT_DIRECT_EDITOR:

+			initializeDirectEditManager(theRequest);

+			break;

+		default:

+			break;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void initializeDirectEditManager(final Request request) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)request.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshVisuals() {

+		super.refreshVisuals();

+		refreshLabel();

+		refreshFont();

+		refreshFontColor();

+		refreshUnderline();

+		refreshStrikeThrough();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshLabel() {

+		EditPolicy maskLabelPolicy = getEditPolicy(IMaskManagedLabelEditPolicy.MASK_MANAGED_LABEL_EDIT_POLICY);

+		if(maskLabelPolicy == null) {

+			setLabelTextHelper(getFigure(), getLabelText());

+			setLabelIconHelper(getFigure(), getLabelIcon());

+		}

+		Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);

+		if(pdEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)pdEditPolicy).refreshFeedback();

+		}

+		Object sfEditPolicy = getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE);

+		if(sfEditPolicy instanceof UMLTextSelectionEditPolicy) {

+			((UMLTextSelectionEditPolicy)sfEditPolicy).refreshFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshUnderline() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextUnderline(style.isUnderline());

+		}

+		if(resolveSemanticElement() instanceof Feature) {

+			if(((Feature)resolveSemanticElement()).isStatic()) {

+				((WrappingLabel)getFigure()).setTextUnderline(true);

+			} else {

+				((WrappingLabel)getFigure()).setTextUnderline(false);

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshStrikeThrough() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null && getFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getFigure()).setTextStrikeThrough(style.isStrikeThrough());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFont() {

+		FontStyle style = (FontStyle)getFontStyleOwnerView().getStyle(NotationPackage.eINSTANCE.getFontStyle());

+		if(style != null) {

+			FontData fontData = new FontData(style.getFontName(), style.getFontHeight(), (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));

+			setFont(fontData);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setFontColor(Color color) {

+		getFigure().setForegroundColor(color);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addSemanticListeners() {

+		if(getParser() instanceof ISemanticParser) {

+			EObject element = resolveSemanticElement();

+			parserElements = ((ISemanticParser)getParser()).getSemanticElementsBeingParsed(element);

+			for(int i = 0; i < parserElements.size(); i++) {

+				addListenerFilter("SemanticModel" + i, this, (EObject)parserElements.get(i)); //$NON-NLS-1$

+			}

+		} else {

+			super.addSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeSemanticListeners() {

+		if(parserElements != null) {

+			for(int i = 0; i < parserElements.size(); i++) {

+				removeListenerFilter("SemanticModel" + i); //$NON-NLS-1$

+			}

+		} else {

+			super.removeSemanticListeners();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected AccessibleEditPart getAccessibleEditPart() {

+		if(accessibleEP == null) {

+			accessibleEP = new AccessibleGraphicalEditPart() {

+

+				public void getName(AccessibleEvent e) {

+					e.result = getLabelTextHelper(getFigure());

+				}

+			};

+		}

+		return accessibleEP;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getFontStyleOwnerView() {

+		return getPrimaryView();

+	}

+

+	/**

+	 * Returns the kind of associated editor for direct edition.

+	 * 

+	 * @return an <code>int</code> corresponding to the kind of direct editor, @see org.eclipse.papyrus.uml.diagram.common.editpolicies.IDirectEdition

+	 * @generated

+	 */

+	public int getDirectEditionType() {

+		if(checkExtendedEditor()) {

+			initExtendedEditorConfiguration();

+			return IDirectEdition.EXTENDED_DIRECT_EDITOR;

+		}

+		if(checkDefaultEdition()) {

+			return IDirectEdition.DEFAULT_DIRECT_EDITOR;

+		}

+

+		// not a named element. no specific editor => do nothing

+		return IDirectEdition.NO_DIRECT_EDITION;

+	}

+

+	/**

+	 * Checks if an extended editor is present.

+	 * 

+	 * @return <code>true</code> if an extended editor is present.

+	 * @generated

+	 */

+	protected boolean checkExtendedEditor() {

+		if(resolveSemanticElement() != null) {

+			return DirectEditorsUtil.hasSpecificEditorConfiguration(resolveSemanticElement().eClass().getInstanceClassName());

+		}

+		return false;

+	}

+

+	/**

+	 * Checks if a default direct edition is available

+	 * 

+	 * @return <code>true</code> if a default direct edition is available

+	 * @generated

+	 */

+	protected boolean checkDefaultEdition() {

+		return (getParser() != null);

+	}

+

+	/**

+	 * Initializes the extended editor configuration

+	 * 

+	 * @generated

+	 */

+	protected void initExtendedEditorConfiguration() {

+		if(configuration == null) {

+			final String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+			if(languagePreferred != null && !languagePreferred.equals("")) {

+				configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+			} else {

+				configuration = DirectEditorsUtil.findEditorConfiguration(IDirectEditorsIds.UML_LANGUAGE, resolveSemanticElement().eClass().getInstanceClassName());

+			}

+		}

+	}

+

+	/**

+	 * Updates the preference configuration

+	 * 

+	 * @generated

+	 */

+	protected void updateExtendedEditorConfiguration() {

+		String languagePreferred = Activator.getDefault().getPreferenceStore().getString(IDirectEditorsIds.EDITOR_FOR_ELEMENT + resolveSemanticElement().eClass().getInstanceClassName());

+		if(languagePreferred != null && !languagePreferred.equals("") && !languagePreferred.equals(configuration.getLanguage())) {

+			configuration = DirectEditorsUtil.findEditorConfiguration(languagePreferred, resolveSemanticElement().eClass().getInstanceClassName());

+		} else if(IDirectEditorsIds.SIMPLE_DIRECT_EDITOR.equals(languagePreferred)) {

+			configuration = null;

+		}

+	}

+

+	/**

+	 * Performs the direct edit usually used by GMF editors.

+	 * 

+	 * @param theRequest

+	 *        the direct edit request that starts the direct edit system

+	 * @generated

+	 */

+	protected void performDefaultDirectEditorEdit(final Request theRequest) {

+		// initialize the direct edit manager

+		try {

+			getEditingDomain().runExclusive(new Runnable() {

+

+				public void run() {

+					if(isActive() && isEditable()) {

+						if(theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {

+							Character initialChar = (Character)theRequest.getExtendedData().get(RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);

+							performDirectEdit(initialChar.charValue());

+						} else if((theRequest instanceof DirectEditRequest) && (getEditText().equals(getLabelText()))) {

+							DirectEditRequest editRequest = (DirectEditRequest)theRequest;

+							performDirectEdit(editRequest.getLocation());

+						} else {

+							performDirectEdit();

+						}

+					}

+				}

+			});

+		} catch (InterruptedException e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addNotationalListeners() {

+		super.addNotationalListeners();

+		addListenerFilter("PrimaryView", this, getPrimaryView()); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeNotationalListeners() {

+		super.removeNotationalListeners();

+		removeListenerFilter("PrimaryView"); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleNotificationEvent(Notification event) {

+		refreshLabel();

+		Object feature = event.getFeature();

+		if(NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {

+			Integer c = (Integer)event.getNewValue();

+			setFontColor(DiagramColorRegistry.getInstance().getColor(c));

+		} else if(NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {

+			refreshUnderline();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {

+			refreshStrikeThrough();

+		} else if(NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {

+			refreshFont();

+		} else {

+			if(getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {

+				refreshLabel();

+			}

+			if(getParser() instanceof ISemanticParser) {

+				ISemanticParser modelParser = (ISemanticParser)getParser();

+				if(modelParser.areSemanticElementsAffected(null, event)) {

+					removeSemanticListeners();

+					if(resolveSemanticElement() != null) {

+						addSemanticListeners();

+					}

+					refreshLabel();

+				}

+			}

+		}

+		if(event.getNewValue() instanceof EAnnotation && VisualInformationPapyrusConstants.DISPLAY_NAMELABELICON.equals(((EAnnotation)event.getNewValue()).getSource())) {

+			refreshLabel();

+		}

+		super.handleNotificationEvent(event);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFigure() {

+		// Parent should assign one using setLabel() method

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static final String ADD_PARENT_MODEL = "AddParentModel";

+

+	/**

+	 * @generated

+	 */

+	public void activate() {

+		super.activate();

+		addOwnerElementListeners();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void addOwnerElementListeners() {

+		addListenerFilter(ADD_PARENT_MODEL, this, ((View)getParent().getModel())); //$NON-NLS-1$

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void deactivate() {

+		removeOwnerElementListeners();

+		super.deactivate();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void removeOwnerElementListeners() {

+		removeListenerFilter(ADD_PARENT_MODEL);

+

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/AbstractionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/AbstractionItemSemanticEditPolicy.java
index 10bd4924cb6..e7029f5d380 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/AbstractionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/AbstractionItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class AbstractionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public AbstractionItemSemanticEditPolicy() {
-		super(UMLElementTypes.Abstraction_4007);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class AbstractionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public AbstractionItemSemanticEditPolicy() {

+		super(UMLElementTypes.Abstraction_4007);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeCompartmentItemSemanticEditPolicy.java
index 44dec437996..e7b6f1326eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeCompartmentItemSemanticEditPolicy.java
@@ -1,165 +1,230 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ActivityCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ActivityCompositeCompartmentItemSemanticEditPolicy() {
-		super(UMLElementTypes.Activity_2060);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Parameter_3088 == requestElementType) {
-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Property_3070 == requestElementType) {
-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {
-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Activity_3072 == requestElementType) {
-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interaction_3073 == requestElementType) {
-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {
-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {
-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {
-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {
-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Component_3081 == requestElementType) {
-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Device_3082 == requestElementType) {
-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {
-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Node_3084 == requestElementType) {
-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Class_3085 == requestElementType) {
-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {
-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interface_3087 == requestElementType) {
-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {
-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {
-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DataType_3080 == requestElementType) {
-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Actor_3091 == requestElementType) {
-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {
-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Artifact_3093 == requestElementType) {
-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {
-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Signal_3095 == requestElementType) {
-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.UseCase_3096 == requestElementType) {
-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Comment_3097 == requestElementType) {
-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {
-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {
-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {
-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {
-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Constraint_3120 == requestElementType) {
-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ActivityCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ActivityCompositeCompartmentItemSemanticEditPolicy() {

+		super(UMLElementTypes.Activity_2060);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Parameter_3088 == requestElementType) {

+

+			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Property_3070 == requestElementType) {

+

+			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Activity_3072 == requestElementType) {

+

+			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interaction_3073 == requestElementType) {

+

+			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

+			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.StateMachine_3075 == requestElementType) {

+

+			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

+			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

+			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Component_3081 == requestElementType) {

+

+			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Device_3082 == requestElementType) {

+

+			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

+			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Node_3084 == requestElementType) {

+

+			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Class_3085 == requestElementType) {

+

+			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Collaboration_3086 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interface_3087 == requestElementType) {

+

+			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

+			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Enumeration_3079 == requestElementType) {

+

+			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DataType_3080 == requestElementType) {

+

+			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Actor_3091 == requestElementType) {

+

+			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

+			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Artifact_3093 == requestElementType) {

+

+			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InformationItem_3094 == requestElementType) {

+

+			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Signal_3095 == requestElementType) {

+

+			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.UseCase_3096 == requestElementType) {

+

+			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Comment_3097 == requestElementType) {

+

+			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

+			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

+			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

+			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

+			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Constraint_3120 == requestElementType) {

+

+			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeCompartmentItemSemanticEditPolicyCN.java
index 1a6ee0e0aef..0a45df31917 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeCompartmentItemSemanticEditPolicyCN.java
@@ -1,165 +1,230 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ActivityCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ActivityCompositeCompartmentItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.Activity_3072);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Parameter_3088 == requestElementType) {
-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Property_3070 == requestElementType) {
-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {
-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Activity_3072 == requestElementType) {
-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interaction_3073 == requestElementType) {
-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {
-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {
-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {
-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {
-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Component_3081 == requestElementType) {
-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Device_3082 == requestElementType) {
-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {
-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Node_3084 == requestElementType) {
-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Class_3085 == requestElementType) {
-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {
-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interface_3087 == requestElementType) {
-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {
-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {
-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DataType_3080 == requestElementType) {
-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Actor_3091 == requestElementType) {
-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {
-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Artifact_3093 == requestElementType) {
-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {
-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Signal_3095 == requestElementType) {
-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.UseCase_3096 == requestElementType) {
-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Comment_3097 == requestElementType) {
-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {
-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {
-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {
-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {
-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Constraint_3120 == requestElementType) {
-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ActivityCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ActivityCompositeCompartmentItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.Activity_3072);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Parameter_3088 == requestElementType) {

+

+			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Property_3070 == requestElementType) {

+

+			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Activity_3072 == requestElementType) {

+

+			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interaction_3073 == requestElementType) {

+

+			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

+			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.StateMachine_3075 == requestElementType) {

+

+			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

+			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

+			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Component_3081 == requestElementType) {

+

+			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Device_3082 == requestElementType) {

+

+			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

+			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Node_3084 == requestElementType) {

+

+			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Class_3085 == requestElementType) {

+

+			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Collaboration_3086 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interface_3087 == requestElementType) {

+

+			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

+			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Enumeration_3079 == requestElementType) {

+

+			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DataType_3080 == requestElementType) {

+

+			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Actor_3091 == requestElementType) {

+

+			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

+			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Artifact_3093 == requestElementType) {

+

+			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InformationItem_3094 == requestElementType) {

+

+			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Signal_3095 == requestElementType) {

+

+			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.UseCase_3096 == requestElementType) {

+

+			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Comment_3097 == requestElementType) {

+

+			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

+			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

+			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

+			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

+			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Constraint_3120 == requestElementType) {

+

+			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicy.java
index f1bfee0a2b4..aabf7f40353 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicy.java
@@ -1,452 +1,425 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ActivityCompositeItemSemanticEditPolicy() {
-		super(UMLElementTypes.Activity_2060);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Port_3069 == requestElementType) {
-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Parameter_3088 == requestElementType) {
-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ActivityCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ActivityCompositeItemSemanticEditPolicy() {

+		super(UMLElementTypes.Activity_2060);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Port_3069 == requestElementType) {

+

+			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Parameter_3088 == requestElementType) {

+

+			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicyCN.java
index 448189022aa..fb46b0c3db9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActivityCompositeItemSemanticEditPolicyCN.java
@@ -1,452 +1,425 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ActivityCompositeItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.Activity_3072);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Port_3069 == requestElementType) {
-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Parameter_3088 == requestElementType) {
-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ActivityCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ActivityCompositeItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.Activity_3072);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Port_3069 == requestElementType) {

+

+			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Parameter_3088 == requestElementType) {

+

+			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActorItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActorItemSemanticEditPolicy.java
index 6df2c25d0e4..d448f12dad1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActorItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActorItemSemanticEditPolicy.java
@@ -1,431 +1,398 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ActorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ActorItemSemanticEditPolicy() {
-		super(UMLElementTypes.Actor_2077);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ActorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ActorItemSemanticEditPolicy() {

+		super(UMLElementTypes.Actor_2077);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActorItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActorItemSemanticEditPolicyCN.java
index 08f13d6a580..953e5501c3f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActorItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ActorItemSemanticEditPolicyCN.java
@@ -1,431 +1,398 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ActorItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ActorItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.Actor_3091);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ActorItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ActorItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.Actor_3091);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/AnyReceiveEventItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/AnyReceiveEventItemSemanticEditPolicy.java
index b38af9d830a..8a5e759e9e3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/AnyReceiveEventItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/AnyReceiveEventItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class AnyReceiveEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public AnyReceiveEventItemSemanticEditPolicy() {
-		super(UMLElementTypes.AnyReceiveEvent_2085);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class AnyReceiveEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public AnyReceiveEventItemSemanticEditPolicy() {

+		super(UMLElementTypes.AnyReceiveEvent_2085);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicy.java
index 7d190f05012..6d51c70f819 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicy.java
@@ -1,431 +1,398 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ArtifactItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ArtifactItemSemanticEditPolicy() {
-		super(UMLElementTypes.Artifact_2079);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ArtifactItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ArtifactItemSemanticEditPolicy() {

+		super(UMLElementTypes.Artifact_2079);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicyCN.java
index d33052b9103..77fddc2dfbb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ArtifactItemSemanticEditPolicyCN.java
@@ -1,431 +1,398 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ArtifactItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ArtifactItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.Artifact_3093);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ArtifactItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ArtifactItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.Artifact_3093);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CallEventItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CallEventItemSemanticEditPolicy.java
index 7bb5dd8e27a..29e0018baca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CallEventItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CallEventItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class CallEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public CallEventItemSemanticEditPolicy() {
-		super(UMLElementTypes.CallEvent_2084);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class CallEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CallEventItemSemanticEditPolicy() {

+		super(UMLElementTypes.CallEvent_2084);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ChangeEventItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ChangeEventItemSemanticEditPolicy.java
index 73901cd9ba5..c129ad41508 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ChangeEventItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ChangeEventItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ChangeEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ChangeEventItemSemanticEditPolicy() {
-		super(UMLElementTypes.ChangeEvent_2088);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ChangeEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ChangeEventItemSemanticEditPolicy() {

+		super(UMLElementTypes.ChangeEvent_2088);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeCompartmentItemSemanticEditPolicy.java
index fd6f449f507..ef7e99fbe01 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeCompartmentItemSemanticEditPolicy.java
@@ -1,161 +1,224 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ClassCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ClassCompositeCompartmentItemSemanticEditPolicy() {
-		super(UMLElementTypes.Class_2073);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Property_3070 == requestElementType) {
-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {
-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Activity_3072 == requestElementType) {
-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interaction_3073 == requestElementType) {
-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {
-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {
-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {
-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {
-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Component_3081 == requestElementType) {
-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Device_3082 == requestElementType) {
-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {
-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Node_3084 == requestElementType) {
-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Class_3085 == requestElementType) {
-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {
-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interface_3087 == requestElementType) {
-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {
-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {
-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DataType_3080 == requestElementType) {
-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Actor_3091 == requestElementType) {
-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {
-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Artifact_3093 == requestElementType) {
-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {
-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Signal_3095 == requestElementType) {
-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.UseCase_3096 == requestElementType) {
-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Comment_3097 == requestElementType) {
-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Constraint_3120 == requestElementType) {
-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {
-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {
-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {
-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {
-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ClassCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ClassCompositeCompartmentItemSemanticEditPolicy() {

+		super(UMLElementTypes.Class_2073);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Property_3070 == requestElementType) {

+

+			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Activity_3072 == requestElementType) {

+

+			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interaction_3073 == requestElementType) {

+

+			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

+			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.StateMachine_3075 == requestElementType) {

+

+			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

+			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

+			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Component_3081 == requestElementType) {

+

+			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Device_3082 == requestElementType) {

+

+			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

+			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Node_3084 == requestElementType) {

+

+			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Class_3085 == requestElementType) {

+

+			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Collaboration_3086 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interface_3087 == requestElementType) {

+

+			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

+			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Enumeration_3079 == requestElementType) {

+

+			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DataType_3080 == requestElementType) {

+

+			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Actor_3091 == requestElementType) {

+

+			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

+			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Artifact_3093 == requestElementType) {

+

+			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InformationItem_3094 == requestElementType) {

+

+			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Signal_3095 == requestElementType) {

+

+			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.UseCase_3096 == requestElementType) {

+

+			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Comment_3097 == requestElementType) {

+

+			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Constraint_3120 == requestElementType) {

+

+			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

+			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

+			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

+			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

+			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeCompartmentItemSemanticEditPolicyCN.java
index 09f7b99a6b8..27c2a941db7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeCompartmentItemSemanticEditPolicyCN.java
@@ -1,161 +1,224 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ClassCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ClassCompositeCompartmentItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.Class_3085);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Property_3070 == requestElementType) {
-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {
-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Activity_3072 == requestElementType) {
-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interaction_3073 == requestElementType) {
-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {
-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {
-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {
-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {
-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Component_3081 == requestElementType) {
-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Device_3082 == requestElementType) {
-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {
-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Node_3084 == requestElementType) {
-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Class_3085 == requestElementType) {
-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {
-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interface_3087 == requestElementType) {
-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {
-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {
-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DataType_3080 == requestElementType) {
-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Actor_3091 == requestElementType) {
-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {
-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Artifact_3093 == requestElementType) {
-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {
-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Signal_3095 == requestElementType) {
-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.UseCase_3096 == requestElementType) {
-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Comment_3097 == requestElementType) {
-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {
-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {
-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {
-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {
-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Constraint_3120 == requestElementType) {
-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ClassCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ClassCompositeCompartmentItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.Class_3085);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Property_3070 == requestElementType) {

+

+			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Activity_3072 == requestElementType) {

+

+			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interaction_3073 == requestElementType) {

+

+			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

+			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.StateMachine_3075 == requestElementType) {

+

+			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

+			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

+			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Component_3081 == requestElementType) {

+

+			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Device_3082 == requestElementType) {

+

+			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

+			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Node_3084 == requestElementType) {

+

+			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Class_3085 == requestElementType) {

+

+			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Collaboration_3086 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interface_3087 == requestElementType) {

+

+			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

+			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Enumeration_3079 == requestElementType) {

+

+			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DataType_3080 == requestElementType) {

+

+			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Actor_3091 == requestElementType) {

+

+			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

+			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Artifact_3093 == requestElementType) {

+

+			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InformationItem_3094 == requestElementType) {

+

+			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Signal_3095 == requestElementType) {

+

+			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.UseCase_3096 == requestElementType) {

+

+			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Comment_3097 == requestElementType) {

+

+			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

+			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

+			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

+			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

+			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Constraint_3120 == requestElementType) {

+

+			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicy.java
index f506b63fd85..3ebefc1e8e4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicy.java
@@ -1,448 +1,419 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ClassCompositeItemSemanticEditPolicy() {
-		super(UMLElementTypes.Class_2073);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Port_3069 == requestElementType) {
-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ClassCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ClassCompositeItemSemanticEditPolicy() {

+		super(UMLElementTypes.Class_2073);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Port_3069 == requestElementType) {

+

+			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicyCN.java
index 5c92da110d9..41adf1ebd13 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ClassCompositeItemSemanticEditPolicyCN.java
@@ -1,448 +1,419 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ClassCompositeItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.Class_3085);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Port_3069 == requestElementType) {
-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ClassCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ClassCompositeItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.Class_3085);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Port_3069 == requestElementType) {

+

+			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeCompartmentItemSemanticEditPolicy.java
index 81b695dd105..978a72a7383 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeCompartmentItemSemanticEditPolicy.java
@@ -1,77 +1,98 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationRoleCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class CollaborationCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public CollaborationCompositeCompartmentItemSemanticEditPolicy() {
-		super(UMLElementTypes.Collaboration_2075);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Property_3070 == requestElementType) {
-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {
-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Comment_3097 == requestElementType) {
-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ConnectableElement_3115 == requestElementType) {
-			return getGEFWrapper(new CollaborationRoleCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {
-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {
-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {
-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {
-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Constraint_3120 == requestElementType) {
-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationRoleCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class CollaborationCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CollaborationCompositeCompartmentItemSemanticEditPolicy() {

+		super(UMLElementTypes.Collaboration_2075);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Property_3070 == requestElementType) {

+

+			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Comment_3097 == requestElementType) {

+

+			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ConnectableElement_3115 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationRoleCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

+			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

+			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

+			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

+			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Constraint_3120 == requestElementType) {

+

+			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeCompartmentItemSemanticEditPolicyCN.java
index 37db21778fb..1732e0bac77 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeCompartmentItemSemanticEditPolicyCN.java
@@ -1,77 +1,98 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationRoleCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class CollaborationCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public CollaborationCompositeCompartmentItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.Collaboration_3086);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Property_3070 == requestElementType) {
-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {
-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Comment_3097 == requestElementType) {
-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ConnectableElement_3115 == requestElementType) {
-			return getGEFWrapper(new CollaborationRoleCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {
-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {
-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {
-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {
-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Constraint_3120 == requestElementType) {
-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationRoleCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class CollaborationCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CollaborationCompositeCompartmentItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.Collaboration_3086);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Property_3070 == requestElementType) {

+

+			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Comment_3097 == requestElementType) {

+

+			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ConnectableElement_3115 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationRoleCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

+			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

+			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

+			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

+			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Constraint_3120 == requestElementType) {

+

+			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicy.java
index 15a58835f01..ba1b118452e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicy.java
@@ -1,431 +1,398 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public CollaborationCompositeItemSemanticEditPolicy() {
-		super(UMLElementTypes.Collaboration_2075);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class CollaborationCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CollaborationCompositeItemSemanticEditPolicy() {

+		super(UMLElementTypes.Collaboration_2075);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicyCN.java
index 7f191f6bbd1..0e25839b620 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationCompositeItemSemanticEditPolicyCN.java
@@ -1,431 +1,398 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public CollaborationCompositeItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.Collaboration_3086);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class CollaborationCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CollaborationCompositeItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.Collaboration_3086);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationRoleItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationRoleItemSemanticEditPolicyCN.java
index 30eae1dea33..af943d9cc85 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationRoleItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationRoleItemSemanticEditPolicyCN.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class CollaborationRoleItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public CollaborationRoleItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.ConnectableElement_3115);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class CollaborationRoleItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CollaborationRoleItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.ConnectableElement_3115);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationUseItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationUseItemSemanticEditPolicyCN.java
index d9b4fe57f1e..b41452a3c73 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationUseItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CollaborationUseItemSemanticEditPolicyCN.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class CollaborationUseItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public CollaborationUseItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.CollaborationUse_3071);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class CollaborationUseItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CollaborationUseItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.CollaborationUse_3071);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java
index 76e89bddc0e..ade70b94e33 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentAnnotatedElementItemSemanticEditPolicy.java
@@ -1,36 +1,37 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class CommentAnnotatedElementItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public CommentAnnotatedElementItemSemanticEditPolicy() {
-		super(UMLElementTypes.CommentAnnotatedElement_4002);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {
-		return getGEFWrapper(new DestroyReferenceCommand(req));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class CommentAnnotatedElementItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CommentAnnotatedElementItemSemanticEditPolicy() {

+		super(UMLElementTypes.CommentAnnotatedElement_4002);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {

+		return getGEFWrapper(new DestroyReferenceCommand(req));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentItemSemanticEditPolicy.java
index 60d2a0afb35..3ee03c92d68 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentItemSemanticEditPolicy.java
@@ -1,160 +1,154 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class CommentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public CommentItemSemanticEditPolicy() {
-		super(UMLElementTypes.Comment_2109);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class CommentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CommentItemSemanticEditPolicy() {

+		super(UMLElementTypes.Comment_2109);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentItemSemanticEditPolicyCN.java
index 9ec5b82bc19..51cac0313ec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CommentItemSemanticEditPolicyCN.java
@@ -1,160 +1,154 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class CommentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public CommentItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.Comment_3097);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class CommentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CommentItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.Comment_3097);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicy.java
index 95be6b63ec0..7471a2258de 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicy.java
@@ -1,161 +1,224 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ComponentCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ComponentCompositeCompartmentItemSemanticEditPolicy() {
-		super(UMLElementTypes.Component_2069);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Property_3070 == requestElementType) {
-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {
-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Activity_3072 == requestElementType) {
-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interaction_3073 == requestElementType) {
-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {
-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {
-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {
-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {
-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Component_3081 == requestElementType) {
-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Device_3082 == requestElementType) {
-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {
-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Node_3084 == requestElementType) {
-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Class_3085 == requestElementType) {
-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {
-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interface_3087 == requestElementType) {
-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {
-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {
-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DataType_3080 == requestElementType) {
-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Actor_3091 == requestElementType) {
-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {
-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Artifact_3093 == requestElementType) {
-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {
-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Signal_3095 == requestElementType) {
-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.UseCase_3096 == requestElementType) {
-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Comment_3097 == requestElementType) {
-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {
-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {
-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {
-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {
-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Constraint_3120 == requestElementType) {
-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ComponentCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ComponentCompositeCompartmentItemSemanticEditPolicy() {

+		super(UMLElementTypes.Component_2069);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Property_3070 == requestElementType) {

+

+			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Activity_3072 == requestElementType) {

+

+			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interaction_3073 == requestElementType) {

+

+			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

+			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.StateMachine_3075 == requestElementType) {

+

+			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

+			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

+			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Component_3081 == requestElementType) {

+

+			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Device_3082 == requestElementType) {

+

+			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

+			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Node_3084 == requestElementType) {

+

+			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Class_3085 == requestElementType) {

+

+			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Collaboration_3086 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interface_3087 == requestElementType) {

+

+			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

+			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Enumeration_3079 == requestElementType) {

+

+			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DataType_3080 == requestElementType) {

+

+			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Actor_3091 == requestElementType) {

+

+			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

+			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Artifact_3093 == requestElementType) {

+

+			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InformationItem_3094 == requestElementType) {

+

+			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Signal_3095 == requestElementType) {

+

+			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.UseCase_3096 == requestElementType) {

+

+			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Comment_3097 == requestElementType) {

+

+			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

+			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

+			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

+			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

+			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Constraint_3120 == requestElementType) {

+

+			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyCN.java
index ef4933e8cee..ed4c59e738c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeCompartmentItemSemanticEditPolicyCN.java
@@ -1,161 +1,224 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ComponentCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ComponentCompositeCompartmentItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.Component_3081);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Property_3070 == requestElementType) {
-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {
-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Activity_3072 == requestElementType) {
-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interaction_3073 == requestElementType) {
-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {
-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {
-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {
-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {
-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Component_3081 == requestElementType) {
-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Device_3082 == requestElementType) {
-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {
-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Node_3084 == requestElementType) {
-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Class_3085 == requestElementType) {
-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {
-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interface_3087 == requestElementType) {
-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {
-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {
-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DataType_3080 == requestElementType) {
-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Actor_3091 == requestElementType) {
-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {
-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Artifact_3093 == requestElementType) {
-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {
-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Signal_3095 == requestElementType) {
-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.UseCase_3096 == requestElementType) {
-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Comment_3097 == requestElementType) {
-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {
-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {
-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {
-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {
-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Constraint_3120 == requestElementType) {
-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ComponentCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ComponentCompositeCompartmentItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.Component_3081);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Property_3070 == requestElementType) {

+

+			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Activity_3072 == requestElementType) {

+

+			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interaction_3073 == requestElementType) {

+

+			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

+			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.StateMachine_3075 == requestElementType) {

+

+			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

+			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

+			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Component_3081 == requestElementType) {

+

+			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Device_3082 == requestElementType) {

+

+			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

+			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Node_3084 == requestElementType) {

+

+			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Class_3085 == requestElementType) {

+

+			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Collaboration_3086 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interface_3087 == requestElementType) {

+

+			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

+			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Enumeration_3079 == requestElementType) {

+

+			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DataType_3080 == requestElementType) {

+

+			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Actor_3091 == requestElementType) {

+

+			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

+			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Artifact_3093 == requestElementType) {

+

+			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InformationItem_3094 == requestElementType) {

+

+			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Signal_3095 == requestElementType) {

+

+			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.UseCase_3096 == requestElementType) {

+

+			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Comment_3097 == requestElementType) {

+

+			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

+			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

+			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

+			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

+			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Constraint_3120 == requestElementType) {

+

+			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicy.java
index 292d0a6267c..4a4271fb065 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicy.java
@@ -1,448 +1,419 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ComponentCompositeItemSemanticEditPolicy() {
-		super(UMLElementTypes.Component_2069);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Port_3069 == requestElementType) {
-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ComponentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ComponentCompositeItemSemanticEditPolicy() {

+		super(UMLElementTypes.Component_2069);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Port_3069 == requestElementType) {

+

+			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicyCN.java
index 8876c6a4ce2..6948ebe7020 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentCompositeItemSemanticEditPolicyCN.java
@@ -1,448 +1,419 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ComponentCompositeItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.Component_3081);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Port_3069 == requestElementType) {
-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ComponentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ComponentCompositeItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.Component_3081);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Port_3069 == requestElementType) {

+

+			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentRealizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentRealizationItemSemanticEditPolicy.java
index 78c85d2c236..eb878d88875 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentRealizationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ComponentRealizationItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ComponentRealizationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ComponentRealizationItemSemanticEditPolicy() {
-		super(UMLElementTypes.ComponentRealization_4004);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ComponentRealizationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ComponentRealizationItemSemanticEditPolicy() {

+		super(UMLElementTypes.ComponentRealization_4004);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CompositeStructureDiagramItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CompositeStructureDiagramItemSemanticEditPolicy.java
index 5c9144def78..50eb6d27807 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CompositeStructureDiagramItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/CompositeStructureDiagramItemSemanticEditPolicy.java
@@ -1,261 +1,363 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.emf.commands.core.commands.DuplicateEObjectsCommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AnyReceiveEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CallEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ChangeEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationIntervalCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExpressionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InstanceValueCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.LiteralBooleanCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.LiteralIntegerCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.LiteralNullCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.LiteralStringCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.LiteralUnlimitedNaturalCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueExpressionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StringExpressionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeExpressionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeIntervalCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class CompositeStructureDiagramItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public CompositeStructureDiagramItemSemanticEditPolicy() {
-		super(UMLElementTypes.Package_1000);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Activity_2060 == requestElementType) {
-			return getGEFWrapper(new ActivityCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interaction_2061 == requestElementType) {
-			return getGEFWrapper(new InteractionCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ProtocolStateMachine_2062 == requestElementType) {
-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.StateMachine_2063 == requestElementType) {
-			return getGEFWrapper(new StateMachineCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.FunctionBehavior_2064 == requestElementType) {
-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.OpaqueBehavior_2065 == requestElementType) {
-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Component_2069 == requestElementType) {
-			return getGEFWrapper(new ComponentCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Device_2070 == requestElementType) {
-			return getGEFWrapper(new DeviceCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ExecutionEnvironment_2071 == requestElementType) {
-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Node_2072 == requestElementType) {
-			return getGEFWrapper(new NodeCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Class_2073 == requestElementType) {
-			return getGEFWrapper(new ClassCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Collaboration_2075 == requestElementType) {
-			return getGEFWrapper(new CollaborationCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interface_2076 == requestElementType) {
-			return getGEFWrapper(new InterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.PrimitiveType_2066 == requestElementType) {
-			return getGEFWrapper(new PrimitiveTypeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Enumeration_2067 == requestElementType) {
-			return getGEFWrapper(new EnumerationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DataType_2068 == requestElementType) {
-			return getGEFWrapper(new DataTypeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Actor_2077 == requestElementType) {
-			return getGEFWrapper(new ActorCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DeploymentSpecification_2078 == requestElementType) {
-			return getGEFWrapper(new DeploymentSpecificationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Artifact_2079 == requestElementType) {
-			return getGEFWrapper(new ArtifactCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InformationItem_2080 == requestElementType) {
-			return getGEFWrapper(new InformationItemCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Signal_2081 == requestElementType) {
-			return getGEFWrapper(new SignalCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.UseCase_2082 == requestElementType) {
-			return getGEFWrapper(new UseCaseCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.SignalEvent_2083 == requestElementType) {
-			return getGEFWrapper(new SignalEventCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.CallEvent_2084 == requestElementType) {
-			return getGEFWrapper(new CallEventCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.AnyReceiveEvent_2085 == requestElementType) {
-			return getGEFWrapper(new AnyReceiveEventCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ChangeEvent_2088 == requestElementType) {
-			return getGEFWrapper(new ChangeEventCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeEvent_2089 == requestElementType) {
-			return getGEFWrapper(new TimeEventCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DurationObservation_2093 == requestElementType) {
-			return getGEFWrapper(new DurationObservationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeObservation_2094 == requestElementType) {
-			return getGEFWrapper(new TimeObservationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.LiteralBoolean_2095 == requestElementType) {
-			return getGEFWrapper(new LiteralBooleanCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.LiteralInteger_2096 == requestElementType) {
-			return getGEFWrapper(new LiteralIntegerCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.LiteralNull_2097 == requestElementType) {
-			return getGEFWrapper(new LiteralNullCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.LiteralString_2098 == requestElementType) {
-			return getGEFWrapper(new LiteralStringCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.LiteralUnlimitedNatural_2099 == requestElementType) {
-			return getGEFWrapper(new LiteralUnlimitedNaturalCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.StringExpression_2100 == requestElementType) {
-			return getGEFWrapper(new StringExpressionCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.OpaqueExpression_2101 == requestElementType) {
-			return getGEFWrapper(new OpaqueExpressionCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeExpression_2102 == requestElementType) {
-			return getGEFWrapper(new TimeExpressionCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Expression_2103 == requestElementType) {
-			return getGEFWrapper(new ExpressionCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Duration_2104 == requestElementType) {
-			return getGEFWrapper(new DurationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeInterval_2105 == requestElementType) {
-			return getGEFWrapper(new TimeIntervalCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DurationInterval_2106 == requestElementType) {
-			return getGEFWrapper(new DurationIntervalCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interval_2107 == requestElementType) {
-			return getGEFWrapper(new IntervalCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InstanceValue_2108 == requestElementType) {
-			return getGEFWrapper(new InstanceValueCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Comment_2109 == requestElementType) {
-			return getGEFWrapper(new CommentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DurationConstraint_2110 == requestElementType) {
-			return getGEFWrapper(new DurationConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeConstraint_2111 == requestElementType) {
-			return getGEFWrapper(new TimeConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.IntervalConstraint_2112 == requestElementType) {
-			return getGEFWrapper(new IntervalConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InteractionConstraint_2113 == requestElementType) {
-			return getGEFWrapper(new InteractionConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Constraint_2114 == requestElementType) {
-			return getGEFWrapper(new ConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDuplicateCommand(DuplicateElementsRequest req) {
-		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart) getHost()).getEditingDomain();
-		return getGEFWrapper(new DuplicateAnythingCommand(editingDomain, req));
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class DuplicateAnythingCommand extends DuplicateEObjectsCommand {
-		/**
-		 * @generated
-		 */
-		public DuplicateAnythingCommand(TransactionalEditingDomain editingDomain, DuplicateElementsRequest req) {
-			super(editingDomain, req.getLabel(), req.getElementsToBeDuplicated(), req.getAllDuplicatedElementsMap());
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.emf.commands.core.commands.DuplicateEObjectsCommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AnyReceiveEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CallEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ChangeEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationIntervalCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExpressionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InstanceValueCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.LiteralBooleanCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.LiteralIntegerCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.LiteralNullCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.LiteralStringCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.LiteralUnlimitedNaturalCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueExpressionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StringExpressionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeExpressionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeIntervalCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class CompositeStructureDiagramItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public CompositeStructureDiagramItemSemanticEditPolicy() {

+		super(UMLElementTypes.Package_1000);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Activity_2060 == requestElementType) {

+

+			return getGEFWrapper(new ActivityCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interaction_2061 == requestElementType) {

+

+			return getGEFWrapper(new InteractionCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ProtocolStateMachine_2062 == requestElementType) {

+

+			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.StateMachine_2063 == requestElementType) {

+

+			return getGEFWrapper(new StateMachineCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.FunctionBehavior_2064 == requestElementType) {

+

+			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.OpaqueBehavior_2065 == requestElementType) {

+

+			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Component_2069 == requestElementType) {

+

+			return getGEFWrapper(new ComponentCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Device_2070 == requestElementType) {

+

+			return getGEFWrapper(new DeviceCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ExecutionEnvironment_2071 == requestElementType) {

+

+			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Node_2072 == requestElementType) {

+

+			return getGEFWrapper(new NodeCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Class_2073 == requestElementType) {

+

+			return getGEFWrapper(new ClassCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Collaboration_2075 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationCompositeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interface_2076 == requestElementType) {

+

+			return getGEFWrapper(new InterfaceCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.PrimitiveType_2066 == requestElementType) {

+

+			return getGEFWrapper(new PrimitiveTypeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Enumeration_2067 == requestElementType) {

+

+			return getGEFWrapper(new EnumerationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DataType_2068 == requestElementType) {

+

+			return getGEFWrapper(new DataTypeCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Actor_2077 == requestElementType) {

+

+			return getGEFWrapper(new ActorCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DeploymentSpecification_2078 == requestElementType) {

+

+			return getGEFWrapper(new DeploymentSpecificationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Artifact_2079 == requestElementType) {

+

+			return getGEFWrapper(new ArtifactCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InformationItem_2080 == requestElementType) {

+

+			return getGEFWrapper(new InformationItemCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Signal_2081 == requestElementType) {

+

+			return getGEFWrapper(new SignalCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.UseCase_2082 == requestElementType) {

+

+			return getGEFWrapper(new UseCaseCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.SignalEvent_2083 == requestElementType) {

+

+			return getGEFWrapper(new SignalEventCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.CallEvent_2084 == requestElementType) {

+

+			return getGEFWrapper(new CallEventCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.AnyReceiveEvent_2085 == requestElementType) {

+

+			return getGEFWrapper(new AnyReceiveEventCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ChangeEvent_2088 == requestElementType) {

+

+			return getGEFWrapper(new ChangeEventCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeEvent_2089 == requestElementType) {

+

+			return getGEFWrapper(new TimeEventCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DurationObservation_2093 == requestElementType) {

+

+			return getGEFWrapper(new DurationObservationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeObservation_2094 == requestElementType) {

+

+			return getGEFWrapper(new TimeObservationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.LiteralBoolean_2095 == requestElementType) {

+

+			return getGEFWrapper(new LiteralBooleanCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.LiteralInteger_2096 == requestElementType) {

+

+			return getGEFWrapper(new LiteralIntegerCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.LiteralNull_2097 == requestElementType) {

+

+			return getGEFWrapper(new LiteralNullCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.LiteralString_2098 == requestElementType) {

+

+			return getGEFWrapper(new LiteralStringCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.LiteralUnlimitedNatural_2099 == requestElementType) {

+

+			return getGEFWrapper(new LiteralUnlimitedNaturalCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.StringExpression_2100 == requestElementType) {

+

+			return getGEFWrapper(new StringExpressionCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.OpaqueExpression_2101 == requestElementType) {

+

+			return getGEFWrapper(new OpaqueExpressionCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeExpression_2102 == requestElementType) {

+

+			return getGEFWrapper(new TimeExpressionCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Expression_2103 == requestElementType) {

+

+			return getGEFWrapper(new ExpressionCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Duration_2104 == requestElementType) {

+

+			return getGEFWrapper(new DurationCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeInterval_2105 == requestElementType) {

+

+			return getGEFWrapper(new TimeIntervalCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DurationInterval_2106 == requestElementType) {

+

+			return getGEFWrapper(new DurationIntervalCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interval_2107 == requestElementType) {

+

+			return getGEFWrapper(new IntervalCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InstanceValue_2108 == requestElementType) {

+

+			return getGEFWrapper(new InstanceValueCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Comment_2109 == requestElementType) {

+

+			return getGEFWrapper(new CommentCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DurationConstraint_2110 == requestElementType) {

+

+			return getGEFWrapper(new DurationConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeConstraint_2111 == requestElementType) {

+

+			return getGEFWrapper(new TimeConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.IntervalConstraint_2112 == requestElementType) {

+

+			return getGEFWrapper(new IntervalConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InteractionConstraint_2113 == requestElementType) {

+

+			return getGEFWrapper(new InteractionConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Constraint_2114 == requestElementType) {

+

+			return getGEFWrapper(new ConstraintCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDuplicateCommand(DuplicateElementsRequest req) {

+		TransactionalEditingDomain editingDomain = ((IGraphicalEditPart)getHost()).getEditingDomain();

+		return getGEFWrapper(new DuplicateAnythingCommand(editingDomain, req));

+	}

+

+	/**

+	 * @generated

+	 */

+	private static class DuplicateAnythingCommand extends DuplicateEObjectsCommand {

+

+		/**

+		 * @generated

+		 */

+		public DuplicateAnythingCommand(TransactionalEditingDomain editingDomain, DuplicateElementsRequest req) {

+			super(editingDomain, req.getLabel(), req.getElementsToBeDuplicated(), req.getAllDuplicatedElementsMap());

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConnectorItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConnectorItemSemanticEditPolicy.java
index d2883b5d193..d40d5ebecc8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConnectorItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConnectorItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ConnectorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ConnectorItemSemanticEditPolicy() {
-		super(UMLElementTypes.Connector_4013);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ConnectorItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConnectorItemSemanticEditPolicy() {

+		super(UMLElementTypes.Connector_4013);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java
index b64b6bfae61..8377bbdc556 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintConstrainedElementItemSemanticEditPolicy.java
@@ -1,36 +1,37 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ConstraintConstrainedElementItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ConstraintConstrainedElementItemSemanticEditPolicy() {
-		super(UMLElementTypes.ConstraintConstrainedElement_4003);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {
-		return getGEFWrapper(new DestroyReferenceCommand(req));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ConstraintConstrainedElementItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConstraintConstrainedElementItemSemanticEditPolicy() {

+		super(UMLElementTypes.ConstraintConstrainedElement_4003);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {

+		return getGEFWrapper(new DestroyReferenceCommand(req));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicy.java
index 402a803dafc..c4d8bfc8c7b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicy.java
@@ -1,403 +1,372 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ConstraintItemSemanticEditPolicy() {
-		super(UMLElementTypes.Constraint_2114);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConstraintItemSemanticEditPolicy() {

+		super(UMLElementTypes.Constraint_2114);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicyCN.java
index b0eb6cb4232..d1e8cdb6261 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ConstraintItemSemanticEditPolicyCN.java
@@ -1,403 +1,372 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ConstraintItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.Constraint_3120);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ConstraintItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.Constraint_3120);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicy.java
index dd1d83cfdfb..01cdab2b13c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicy.java
@@ -1,45 +1,50 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyCreateCommandCLN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class DataTypeAttributeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public DataTypeAttributeCompartmentItemSemanticEditPolicy() {
-		super(UMLElementTypes.DataType_2068);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Property_3101 == requestElementType) {
-			return getGEFWrapper(new PropertyCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyCreateCommandCLN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class DataTypeAttributeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public DataTypeAttributeCompartmentItemSemanticEditPolicy() {

+		super(UMLElementTypes.DataType_2068);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Property_3101 == requestElementType) {

+

+			return getGEFWrapper(new PropertyCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicyCN.java
index c7908077649..79bad967794 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeAttributeCompartmentItemSemanticEditPolicyCN.java
@@ -1,45 +1,50 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyCreateCommandCLN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class DataTypeAttributeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public DataTypeAttributeCompartmentItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.DataType_3080);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Property_3101 == requestElementType) {
-			return getGEFWrapper(new PropertyCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyCreateCommandCLN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class DataTypeAttributeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public DataTypeAttributeCompartmentItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.DataType_3080);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Property_3101 == requestElementType) {

+

+			return getGEFWrapper(new PropertyCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicy.java
index f91f0681607..d8e5bf29741 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicy.java
@@ -1,431 +1,398 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class DataTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public DataTypeItemSemanticEditPolicy() {
-		super(UMLElementTypes.DataType_2068);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class DataTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public DataTypeItemSemanticEditPolicy() {

+		super(UMLElementTypes.DataType_2068);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicyCN.java
index d26c78f055a..3fc73b4bfc5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeItemSemanticEditPolicyCN.java
@@ -1,431 +1,398 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class DataTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public DataTypeItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.DataType_3080);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class DataTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public DataTypeItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.DataType_3080);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicy.java
index 1fc8f3a53a1..2f863f6a56c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicy.java
@@ -1,45 +1,50 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OperationCreateCommandCLN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class DataTypeOperationCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public DataTypeOperationCompartmentItemSemanticEditPolicy() {
-		super(UMLElementTypes.DataType_2068);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Operation_3102 == requestElementType) {
-			return getGEFWrapper(new OperationCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OperationCreateCommandCLN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class DataTypeOperationCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public DataTypeOperationCompartmentItemSemanticEditPolicy() {

+		super(UMLElementTypes.DataType_2068);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Operation_3102 == requestElementType) {

+

+			return getGEFWrapper(new OperationCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicyCN.java
index bba56e7a95b..29efedd292a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DataTypeOperationCompartmentItemSemanticEditPolicyCN.java
@@ -1,45 +1,50 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OperationCreateCommandCLN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class DataTypeOperationCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public DataTypeOperationCompartmentItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.DataType_3080);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Operation_3102 == requestElementType) {
-			return getGEFWrapper(new OperationCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OperationCreateCommandCLN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class DataTypeOperationCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public DataTypeOperationCompartmentItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.DataType_3080);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Operation_3102 == requestElementType) {

+

+			return getGEFWrapper(new OperationCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DependencyItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DependencyItemSemanticEditPolicy.java
index 9b6751839ac..d71b331647c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DependencyItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DependencyItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class DependencyItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public DependencyItemSemanticEditPolicy() {
-		super(UMLElementTypes.Dependency_4010);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class DependencyItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public DependencyItemSemanticEditPolicy() {

+		super(UMLElementTypes.Dependency_4010);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentItemSemanticEditPolicy.java
index 511b21b8a46..dee4cf30ff7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class DeploymentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public DeploymentItemSemanticEditPolicy() {
-		super(UMLElementTypes.Deployment_4009);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class DeploymentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public DeploymentItemSemanticEditPolicy() {

+		super(UMLElementTypes.Deployment_4009);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicy.java
index dedb4402f6a..16da8800985 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicy.java
@@ -1,431 +1,398 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class DeploymentSpecificationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public DeploymentSpecificationItemSemanticEditPolicy() {
-		super(UMLElementTypes.DeploymentSpecification_2078);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class DeploymentSpecificationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public DeploymentSpecificationItemSemanticEditPolicy() {

+		super(UMLElementTypes.DeploymentSpecification_2078);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicyCN.java
index 52510d85e4b..7a0f442be9d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeploymentSpecificationItemSemanticEditPolicyCN.java
@@ -1,431 +1,398 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class DeploymentSpecificationItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public DeploymentSpecificationItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.DeploymentSpecification_3092);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class DeploymentSpecificationItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public DeploymentSpecificationItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.DeploymentSpecification_3092);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeCompartmentItemSemanticEditPolicy.java
index 159576cc033..43cf1e253c3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeCompartmentItemSemanticEditPolicy.java
@@ -1,161 +1,224 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class DeviceCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public DeviceCompositeCompartmentItemSemanticEditPolicy() {
-		super(UMLElementTypes.Device_2070);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Property_3070 == requestElementType) {
-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {
-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Activity_3072 == requestElementType) {
-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interaction_3073 == requestElementType) {
-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {
-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {
-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {
-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {
-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Component_3081 == requestElementType) {
-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Device_3082 == requestElementType) {
-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {
-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Node_3084 == requestElementType) {
-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Class_3085 == requestElementType) {
-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {
-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interface_3087 == requestElementType) {
-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {
-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {
-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DataType_3080 == requestElementType) {
-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Actor_3091 == requestElementType) {
-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {
-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Artifact_3093 == requestElementType) {
-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {
-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Signal_3095 == requestElementType) {
-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.UseCase_3096 == requestElementType) {
-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Comment_3097 == requestElementType) {
-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {
-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {
-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {
-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {
-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Constraint_3120 == requestElementType) {
-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class DeviceCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public DeviceCompositeCompartmentItemSemanticEditPolicy() {

+		super(UMLElementTypes.Device_2070);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Property_3070 == requestElementType) {

+

+			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Activity_3072 == requestElementType) {

+

+			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interaction_3073 == requestElementType) {

+

+			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

+			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.StateMachine_3075 == requestElementType) {

+

+			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

+			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

+			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Component_3081 == requestElementType) {

+

+			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Device_3082 == requestElementType) {

+

+			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

+			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Node_3084 == requestElementType) {

+

+			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Class_3085 == requestElementType) {

+

+			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Collaboration_3086 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interface_3087 == requestElementType) {

+

+			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

+			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Enumeration_3079 == requestElementType) {

+

+			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DataType_3080 == requestElementType) {

+

+			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Actor_3091 == requestElementType) {

+

+			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

+			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Artifact_3093 == requestElementType) {

+

+			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InformationItem_3094 == requestElementType) {

+

+			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Signal_3095 == requestElementType) {

+

+			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.UseCase_3096 == requestElementType) {

+

+			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Comment_3097 == requestElementType) {

+

+			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

+			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

+			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

+			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

+			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Constraint_3120 == requestElementType) {

+

+			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeCompartmentItemSemanticEditPolicyCN.java
index 1d194350b1d..34a1568e0b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeCompartmentItemSemanticEditPolicyCN.java
@@ -1,161 +1,224 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class DeviceCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public DeviceCompositeCompartmentItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.Device_3082);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Property_3070 == requestElementType) {
-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {
-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Activity_3072 == requestElementType) {
-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interaction_3073 == requestElementType) {
-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {
-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {
-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {
-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {
-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Component_3081 == requestElementType) {
-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Device_3082 == requestElementType) {
-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {
-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Node_3084 == requestElementType) {
-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Class_3085 == requestElementType) {
-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {
-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interface_3087 == requestElementType) {
-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {
-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {
-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DataType_3080 == requestElementType) {
-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Actor_3091 == requestElementType) {
-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {
-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Artifact_3093 == requestElementType) {
-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {
-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Signal_3095 == requestElementType) {
-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.UseCase_3096 == requestElementType) {
-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Comment_3097 == requestElementType) {
-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {
-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {
-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {
-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {
-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Constraint_3120 == requestElementType) {
-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class DeviceCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public DeviceCompositeCompartmentItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.Device_3082);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Property_3070 == requestElementType) {

+

+			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Activity_3072 == requestElementType) {

+

+			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interaction_3073 == requestElementType) {

+

+			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

+			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.StateMachine_3075 == requestElementType) {

+

+			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

+			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

+			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Component_3081 == requestElementType) {

+

+			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Device_3082 == requestElementType) {

+

+			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

+			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Node_3084 == requestElementType) {

+

+			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Class_3085 == requestElementType) {

+

+			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Collaboration_3086 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interface_3087 == requestElementType) {

+

+			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

+			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Enumeration_3079 == requestElementType) {

+

+			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DataType_3080 == requestElementType) {

+

+			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Actor_3091 == requestElementType) {

+

+			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

+			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Artifact_3093 == requestElementType) {

+

+			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InformationItem_3094 == requestElementType) {

+

+			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Signal_3095 == requestElementType) {

+

+			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.UseCase_3096 == requestElementType) {

+

+			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Comment_3097 == requestElementType) {

+

+			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

+			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

+			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

+			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

+			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Constraint_3120 == requestElementType) {

+

+			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicy.java
index b9a07677533..731cbdb9f96 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicy.java
@@ -1,448 +1,419 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public DeviceCompositeItemSemanticEditPolicy() {
-		super(UMLElementTypes.Device_2070);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Port_3069 == requestElementType) {
-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class DeviceCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public DeviceCompositeItemSemanticEditPolicy() {

+		super(UMLElementTypes.Device_2070);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Port_3069 == requestElementType) {

+

+			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicyCN.java
index 53eab440834..6f54d3d2043 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DeviceCompositeItemSemanticEditPolicyCN.java
@@ -1,448 +1,419 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public DeviceCompositeItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.Device_3082);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Port_3069 == requestElementType) {
-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class DeviceCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public DeviceCompositeItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.Device_3082);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Port_3069 == requestElementType) {

+

+			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicy.java
index a479d62476f..bb2e893eed8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicy.java
@@ -1,403 +1,372 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class DurationConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public DurationConstraintItemSemanticEditPolicy() {
-		super(UMLElementTypes.DurationConstraint_2110);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class DurationConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public DurationConstraintItemSemanticEditPolicy() {

+		super(UMLElementTypes.DurationConstraint_2110);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicyCN.java
index a408d7d173b..5002b1b5140 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationConstraintItemSemanticEditPolicyCN.java
@@ -1,403 +1,372 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class DurationConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public DurationConstraintItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.DurationConstraint_3116);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class DurationConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public DurationConstraintItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.DurationConstraint_3116);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationIntervalItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationIntervalItemSemanticEditPolicy.java
index 91914e36fa9..e0c9f40ccf8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationIntervalItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationIntervalItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class DurationIntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public DurationIntervalItemSemanticEditPolicy() {
-		super(UMLElementTypes.DurationInterval_2106);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class DurationIntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public DurationIntervalItemSemanticEditPolicy() {

+		super(UMLElementTypes.DurationInterval_2106);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationItemSemanticEditPolicy.java
index f9a157f7b4d..19fcefd1fee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class DurationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public DurationItemSemanticEditPolicy() {
-		super(UMLElementTypes.Duration_2104);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class DurationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public DurationItemSemanticEditPolicy() {

+		super(UMLElementTypes.Duration_2104);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationObservationEventItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationObservationEventItemSemanticEditPolicy.java
index 92f5a04bf43..ff942a81c75 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationObservationEventItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationObservationEventItemSemanticEditPolicy.java
@@ -1,36 +1,37 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class DurationObservationEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public DurationObservationEventItemSemanticEditPolicy() {
-		super(UMLElementTypes.DurationObservationEvent_4019);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {
-		return getGEFWrapper(new DestroyReferenceCommand(req));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class DurationObservationEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public DurationObservationEventItemSemanticEditPolicy() {

+		super(UMLElementTypes.DurationObservationEvent_4019);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {

+		return getGEFWrapper(new DestroyReferenceCommand(req));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationObservationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationObservationItemSemanticEditPolicy.java
index 9f1839cc11c..d8fc7039098 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationObservationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/DurationObservationItemSemanticEditPolicy.java
@@ -1,403 +1,372 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class DurationObservationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public DurationObservationItemSemanticEditPolicy() {
-		super(UMLElementTypes.DurationObservation_2093);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class DurationObservationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public DurationObservationItemSemanticEditPolicy() {

+		super(UMLElementTypes.DurationObservation_2093);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy.java
index 075dbba14b7..7e1cd5cd19a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy.java
@@ -1,45 +1,50 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationLiteralCreateCommandCLN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy() {
-		super(UMLElementTypes.Enumeration_2067);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.EnumerationLiteral_3066 == requestElementType) {
-			return getGEFWrapper(new EnumerationLiteralCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationLiteralCreateCommandCLN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicy() {

+		super(UMLElementTypes.Enumeration_2067);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.EnumerationLiteral_3066 == requestElementType) {

+

+			return getGEFWrapper(new EnumerationLiteralCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN.java
index de97967e22c..8e9010a5ba0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN.java
@@ -1,45 +1,50 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationLiteralCreateCommandCLN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.Enumeration_3079);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.EnumerationLiteral_3066 == requestElementType) {
-			return getGEFWrapper(new EnumerationLiteralCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationLiteralCreateCommandCLN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public EnumerationEnumerationLiteralCompartmentItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.Enumeration_3079);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.EnumerationLiteral_3066 == requestElementType) {

+

+			return getGEFWrapper(new EnumerationLiteralCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicy.java
index f6b2d86f7a6..a372ce93bf6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicy.java
@@ -1,448 +1,419 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationLiteralCreateCommandCLN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class EnumerationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public EnumerationItemSemanticEditPolicy() {
-		super(UMLElementTypes.Enumeration_2067);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.EnumerationLiteral_3066 == requestElementType) {
-			return getGEFWrapper(new EnumerationLiteralCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationLiteralCreateCommandCLN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class EnumerationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public EnumerationItemSemanticEditPolicy() {

+		super(UMLElementTypes.Enumeration_2067);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.EnumerationLiteral_3066 == requestElementType) {

+

+			return getGEFWrapper(new EnumerationLiteralCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicyCN.java
index df730570dd6..9f1168da2f2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationItemSemanticEditPolicyCN.java
@@ -1,448 +1,419 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationLiteralCreateCommandCLN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class EnumerationItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public EnumerationItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.Enumeration_3079);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.EnumerationLiteral_3066 == requestElementType) {
-			return getGEFWrapper(new EnumerationLiteralCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationLiteralCreateCommandCLN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class EnumerationItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public EnumerationItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.Enumeration_3079);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.EnumerationLiteral_3066 == requestElementType) {

+

+			return getGEFWrapper(new EnumerationLiteralCreateCommandCLN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationLiteralItemSemanticEditPolicyCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationLiteralItemSemanticEditPolicyCLN.java
index a7918111ef1..b8be9090361 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationLiteralItemSemanticEditPolicyCLN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/EnumerationLiteralItemSemanticEditPolicyCLN.java
@@ -1,59 +1,60 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.DeleteCommand;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class EnumerationLiteralItemSemanticEditPolicyCLN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public EnumerationLiteralItemSemanticEditPolicyCLN() {
-		super(UMLElementTypes.EnumerationLiteral_3066);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		View view = (View) getHost().getModel();
-		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);
-		cmd.setTransactionNestingEnabled(true);
-		EAnnotation annotation = view.getEAnnotation("Shortcut");//$NON-NLS-1$
-		if (annotation == null) {
-			// there are indirectly referenced children, need extra commands: false
-			addDestroyShortcutsCommand(cmd, view);
-			// delete host element
-			List<EObject> todestroy = new ArrayList<EObject>();
-			todestroy.add(req.getElementToDestroy());
-			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));
-			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));
-		} else {
-			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));
-		}
-		return getGEFWrapper(cmd.reduce());
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class EnumerationLiteralItemSemanticEditPolicyCLN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public EnumerationLiteralItemSemanticEditPolicyCLN() {

+		super(UMLElementTypes.EnumerationLiteral_3066);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View)getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(true);

+		EAnnotation annotation = view.getEAnnotation("Shortcut");//$NON-NLS-1$

+		if(annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			List<EObject> todestroy = new ArrayList<EObject>();

+			todestroy.add(req.getElementToDestroy());

+			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

+		} else {

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy.java
index 9355a023f99..e31df8a828d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy.java
@@ -1,161 +1,224 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy() {
-		super(UMLElementTypes.ExecutionEnvironment_2071);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Property_3070 == requestElementType) {
-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {
-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Activity_3072 == requestElementType) {
-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interaction_3073 == requestElementType) {
-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {
-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {
-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {
-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {
-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Component_3081 == requestElementType) {
-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Device_3082 == requestElementType) {
-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {
-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Node_3084 == requestElementType) {
-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Class_3085 == requestElementType) {
-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {
-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interface_3087 == requestElementType) {
-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {
-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {
-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DataType_3080 == requestElementType) {
-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Actor_3091 == requestElementType) {
-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {
-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Artifact_3093 == requestElementType) {
-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {
-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Signal_3095 == requestElementType) {
-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.UseCase_3096 == requestElementType) {
-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Comment_3097 == requestElementType) {
-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {
-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {
-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {
-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {
-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Constraint_3120 == requestElementType) {
-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicy() {

+		super(UMLElementTypes.ExecutionEnvironment_2071);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Property_3070 == requestElementType) {

+

+			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Activity_3072 == requestElementType) {

+

+			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interaction_3073 == requestElementType) {

+

+			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

+			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.StateMachine_3075 == requestElementType) {

+

+			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

+			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

+			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Component_3081 == requestElementType) {

+

+			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Device_3082 == requestElementType) {

+

+			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

+			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Node_3084 == requestElementType) {

+

+			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Class_3085 == requestElementType) {

+

+			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Collaboration_3086 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interface_3087 == requestElementType) {

+

+			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

+			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Enumeration_3079 == requestElementType) {

+

+			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DataType_3080 == requestElementType) {

+

+			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Actor_3091 == requestElementType) {

+

+			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

+			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Artifact_3093 == requestElementType) {

+

+			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InformationItem_3094 == requestElementType) {

+

+			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Signal_3095 == requestElementType) {

+

+			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.UseCase_3096 == requestElementType) {

+

+			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Comment_3097 == requestElementType) {

+

+			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

+			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

+			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

+			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

+			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Constraint_3120 == requestElementType) {

+

+			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN.java
index ef57e307f6e..deda73a4850 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN.java
@@ -1,161 +1,224 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.ExecutionEnvironment_3083);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Property_3070 == requestElementType) {
-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {
-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Activity_3072 == requestElementType) {
-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interaction_3073 == requestElementType) {
-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {
-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {
-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {
-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {
-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Component_3081 == requestElementType) {
-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Device_3082 == requestElementType) {
-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {
-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Node_3084 == requestElementType) {
-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Class_3085 == requestElementType) {
-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {
-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interface_3087 == requestElementType) {
-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {
-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {
-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DataType_3080 == requestElementType) {
-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Actor_3091 == requestElementType) {
-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {
-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Artifact_3093 == requestElementType) {
-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {
-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Signal_3095 == requestElementType) {
-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.UseCase_3096 == requestElementType) {
-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Comment_3097 == requestElementType) {
-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {
-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {
-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {
-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {
-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Constraint_3120 == requestElementType) {
-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ExecutionEnvironmentCompositeCompartmentItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.ExecutionEnvironment_3083);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Property_3070 == requestElementType) {

+

+			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Activity_3072 == requestElementType) {

+

+			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interaction_3073 == requestElementType) {

+

+			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

+			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.StateMachine_3075 == requestElementType) {

+

+			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

+			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

+			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Component_3081 == requestElementType) {

+

+			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Device_3082 == requestElementType) {

+

+			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

+			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Node_3084 == requestElementType) {

+

+			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Class_3085 == requestElementType) {

+

+			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Collaboration_3086 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interface_3087 == requestElementType) {

+

+			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

+			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Enumeration_3079 == requestElementType) {

+

+			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DataType_3080 == requestElementType) {

+

+			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Actor_3091 == requestElementType) {

+

+			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

+			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Artifact_3093 == requestElementType) {

+

+			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InformationItem_3094 == requestElementType) {

+

+			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Signal_3095 == requestElementType) {

+

+			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.UseCase_3096 == requestElementType) {

+

+			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Comment_3097 == requestElementType) {

+

+			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

+			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

+			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

+			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

+			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Constraint_3120 == requestElementType) {

+

+			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicy.java
index 9037480bb9e..084fa83e8f4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicy.java
@@ -1,448 +1,419 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ExecutionEnvironmentCompositeItemSemanticEditPolicy() {
-		super(UMLElementTypes.ExecutionEnvironment_2071);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Port_3069 == requestElementType) {
-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ExecutionEnvironmentCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ExecutionEnvironmentCompositeItemSemanticEditPolicy() {

+		super(UMLElementTypes.ExecutionEnvironment_2071);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Port_3069 == requestElementType) {

+

+			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicyCN.java
index 93f0106e688..5d78107a2ac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExecutionEnvironmentCompositeItemSemanticEditPolicyCN.java
@@ -1,448 +1,419 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ExecutionEnvironmentCompositeItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.ExecutionEnvironment_3083);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Port_3069 == requestElementType) {
-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ExecutionEnvironmentCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ExecutionEnvironmentCompositeItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.ExecutionEnvironment_3083);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Port_3069 == requestElementType) {

+

+			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExpressionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExpressionItemSemanticEditPolicy.java
index aa98ea2e97f..cfcb6391a15 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExpressionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ExpressionItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ExpressionItemSemanticEditPolicy() {
-		super(UMLElementTypes.Expression_2103);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ExpressionItemSemanticEditPolicy() {

+		super(UMLElementTypes.Expression_2103);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy.java
index a779a62b0b8..10b3a3c3c2b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy.java
@@ -1,165 +1,230 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy() {
-		super(UMLElementTypes.FunctionBehavior_2064);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Parameter_3088 == requestElementType) {
-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Property_3070 == requestElementType) {
-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {
-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Activity_3072 == requestElementType) {
-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interaction_3073 == requestElementType) {
-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {
-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {
-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {
-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {
-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Component_3081 == requestElementType) {
-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Device_3082 == requestElementType) {
-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {
-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Node_3084 == requestElementType) {
-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Class_3085 == requestElementType) {
-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {
-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interface_3087 == requestElementType) {
-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {
-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {
-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DataType_3080 == requestElementType) {
-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Actor_3091 == requestElementType) {
-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {
-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Artifact_3093 == requestElementType) {
-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {
-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Signal_3095 == requestElementType) {
-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.UseCase_3096 == requestElementType) {
-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Comment_3097 == requestElementType) {
-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {
-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {
-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {
-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {
-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Constraint_3120 == requestElementType) {
-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public FunctionBehaviorCompositeCompartmentItemSemanticEditPolicy() {

+		super(UMLElementTypes.FunctionBehavior_2064);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Parameter_3088 == requestElementType) {

+

+			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Property_3070 == requestElementType) {

+

+			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Activity_3072 == requestElementType) {

+

+			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interaction_3073 == requestElementType) {

+

+			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

+			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.StateMachine_3075 == requestElementType) {

+

+			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

+			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

+			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Component_3081 == requestElementType) {

+

+			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Device_3082 == requestElementType) {

+

+			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

+			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Node_3084 == requestElementType) {

+

+			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Class_3085 == requestElementType) {

+

+			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Collaboration_3086 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interface_3087 == requestElementType) {

+

+			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

+			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Enumeration_3079 == requestElementType) {

+

+			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DataType_3080 == requestElementType) {

+

+			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Actor_3091 == requestElementType) {

+

+			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

+			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Artifact_3093 == requestElementType) {

+

+			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InformationItem_3094 == requestElementType) {

+

+			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Signal_3095 == requestElementType) {

+

+			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.UseCase_3096 == requestElementType) {

+

+			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Comment_3097 == requestElementType) {

+

+			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

+			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

+			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

+			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

+			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Constraint_3120 == requestElementType) {

+

+			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN.java
index 576e7ca7c12..0d257c5ff26 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN.java
@@ -1,165 +1,230 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.FunctionBehavior_3076);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Parameter_3088 == requestElementType) {
-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Property_3070 == requestElementType) {
-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {
-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Activity_3072 == requestElementType) {
-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interaction_3073 == requestElementType) {
-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {
-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {
-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {
-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {
-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Component_3081 == requestElementType) {
-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Device_3082 == requestElementType) {
-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {
-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Node_3084 == requestElementType) {
-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Class_3085 == requestElementType) {
-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {
-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interface_3087 == requestElementType) {
-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {
-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {
-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DataType_3080 == requestElementType) {
-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Actor_3091 == requestElementType) {
-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {
-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Artifact_3093 == requestElementType) {
-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {
-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Signal_3095 == requestElementType) {
-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.UseCase_3096 == requestElementType) {
-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Comment_3097 == requestElementType) {
-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {
-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {
-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {
-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {
-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Constraint_3120 == requestElementType) {
-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public FunctionBehaviorCompositeCompartmentItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.FunctionBehavior_3076);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Parameter_3088 == requestElementType) {

+

+			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Property_3070 == requestElementType) {

+

+			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Activity_3072 == requestElementType) {

+

+			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interaction_3073 == requestElementType) {

+

+			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

+			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.StateMachine_3075 == requestElementType) {

+

+			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

+			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

+			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Component_3081 == requestElementType) {

+

+			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Device_3082 == requestElementType) {

+

+			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

+			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Node_3084 == requestElementType) {

+

+			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Class_3085 == requestElementType) {

+

+			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Collaboration_3086 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interface_3087 == requestElementType) {

+

+			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

+			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Enumeration_3079 == requestElementType) {

+

+			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DataType_3080 == requestElementType) {

+

+			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Actor_3091 == requestElementType) {

+

+			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

+			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Artifact_3093 == requestElementType) {

+

+			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InformationItem_3094 == requestElementType) {

+

+			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Signal_3095 == requestElementType) {

+

+			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.UseCase_3096 == requestElementType) {

+

+			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Comment_3097 == requestElementType) {

+

+			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

+			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

+			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

+			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

+			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Constraint_3120 == requestElementType) {

+

+			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicy.java
index a3a91d833d3..fe2e92a12da 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicy.java
@@ -1,452 +1,425 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public FunctionBehaviorCompositeItemSemanticEditPolicy() {
-		super(UMLElementTypes.FunctionBehavior_2064);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Port_3069 == requestElementType) {
-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Parameter_3088 == requestElementType) {
-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class FunctionBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public FunctionBehaviorCompositeItemSemanticEditPolicy() {

+		super(UMLElementTypes.FunctionBehavior_2064);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Port_3069 == requestElementType) {

+

+			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Parameter_3088 == requestElementType) {

+

+			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicyCN.java
index e68862842bb..ee627d38177 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/FunctionBehaviorCompositeItemSemanticEditPolicyCN.java
@@ -1,452 +1,425 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public FunctionBehaviorCompositeItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.FunctionBehavior_3076);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Port_3069 == requestElementType) {
-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Parameter_3088 == requestElementType) {
-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class FunctionBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public FunctionBehaviorCompositeItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.FunctionBehavior_3076);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Port_3069 == requestElementType) {

+

+			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Parameter_3088 == requestElementType) {

+

+			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/GeneralizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/GeneralizationItemSemanticEditPolicy.java
index 21196795fe0..7d89bb2a8ff 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/GeneralizationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/GeneralizationItemSemanticEditPolicy.java
@@ -1,153 +1,148 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class GeneralizationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public GeneralizationItemSemanticEditPolicy() {
-		super(UMLElementTypes.Generalization_4015);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class GeneralizationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public GeneralizationItemSemanticEditPolicy() {

+		super(UMLElementTypes.Generalization_4015);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationFlowItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationFlowItemSemanticEditPolicy.java
index 11d461b5965..04f022dece1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationFlowItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationFlowItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class InformationFlowItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public InformationFlowItemSemanticEditPolicy() {
-		super(UMLElementTypes.InformationFlow_4021);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class InformationFlowItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public InformationFlowItemSemanticEditPolicy() {

+		super(UMLElementTypes.InformationFlow_4021);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicy.java
index af763c90e0b..6fb901a9ec6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicy.java
@@ -1,435 +1,401 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class InformationItemItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public InformationItemItemSemanticEditPolicy() {
-		super(UMLElementTypes.InformationItem_2080);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class InformationItemItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public InformationItemItemSemanticEditPolicy() {

+		super(UMLElementTypes.InformationItem_2080);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicyCN.java
index e383285dd34..9d60fbefd3f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InformationItemItemSemanticEditPolicyCN.java
@@ -1,435 +1,401 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class InformationItemItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public InformationItemItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.InformationItem_3094);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class InformationItemItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public InformationItemItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.InformationItem_3094);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InstanceValueItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InstanceValueItemSemanticEditPolicy.java
index c9545162434..99756b8b659 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InstanceValueItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InstanceValueItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class InstanceValueItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public InstanceValueItemSemanticEditPolicy() {
-		super(UMLElementTypes.InstanceValue_2108);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class InstanceValueItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public InstanceValueItemSemanticEditPolicy() {

+		super(UMLElementTypes.InstanceValue_2108);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeCompartmentItemSemanticEditPolicy.java
index 7f23729aab5..0355a8a87f9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeCompartmentItemSemanticEditPolicy.java
@@ -1,165 +1,230 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class InteractionCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public InteractionCompositeCompartmentItemSemanticEditPolicy() {
-		super(UMLElementTypes.Interaction_2061);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Parameter_3088 == requestElementType) {
-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Property_3070 == requestElementType) {
-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {
-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Activity_3072 == requestElementType) {
-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interaction_3073 == requestElementType) {
-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {
-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {
-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {
-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {
-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Component_3081 == requestElementType) {
-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Device_3082 == requestElementType) {
-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {
-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Node_3084 == requestElementType) {
-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Class_3085 == requestElementType) {
-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {
-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interface_3087 == requestElementType) {
-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {
-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {
-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DataType_3080 == requestElementType) {
-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Actor_3091 == requestElementType) {
-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {
-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Artifact_3093 == requestElementType) {
-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {
-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Signal_3095 == requestElementType) {
-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.UseCase_3096 == requestElementType) {
-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Comment_3097 == requestElementType) {
-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {
-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {
-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {
-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {
-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Constraint_3120 == requestElementType) {
-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class InteractionCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public InteractionCompositeCompartmentItemSemanticEditPolicy() {

+		super(UMLElementTypes.Interaction_2061);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Parameter_3088 == requestElementType) {

+

+			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Property_3070 == requestElementType) {

+

+			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Activity_3072 == requestElementType) {

+

+			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interaction_3073 == requestElementType) {

+

+			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

+			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.StateMachine_3075 == requestElementType) {

+

+			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

+			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

+			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Component_3081 == requestElementType) {

+

+			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Device_3082 == requestElementType) {

+

+			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

+			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Node_3084 == requestElementType) {

+

+			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Class_3085 == requestElementType) {

+

+			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Collaboration_3086 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interface_3087 == requestElementType) {

+

+			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

+			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Enumeration_3079 == requestElementType) {

+

+			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DataType_3080 == requestElementType) {

+

+			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Actor_3091 == requestElementType) {

+

+			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

+			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Artifact_3093 == requestElementType) {

+

+			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InformationItem_3094 == requestElementType) {

+

+			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Signal_3095 == requestElementType) {

+

+			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.UseCase_3096 == requestElementType) {

+

+			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Comment_3097 == requestElementType) {

+

+			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

+			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

+			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

+			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

+			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Constraint_3120 == requestElementType) {

+

+			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeCompartmentItemSemanticEditPolicyCN.java
index 00ab259a3e7..4a35606054b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeCompartmentItemSemanticEditPolicyCN.java
@@ -1,165 +1,230 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class InteractionCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public InteractionCompositeCompartmentItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.Interaction_3073);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Parameter_3088 == requestElementType) {
-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Property_3070 == requestElementType) {
-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {
-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Activity_3072 == requestElementType) {
-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interaction_3073 == requestElementType) {
-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {
-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {
-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {
-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {
-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Component_3081 == requestElementType) {
-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Device_3082 == requestElementType) {
-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {
-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Node_3084 == requestElementType) {
-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Class_3085 == requestElementType) {
-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {
-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interface_3087 == requestElementType) {
-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {
-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {
-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DataType_3080 == requestElementType) {
-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Actor_3091 == requestElementType) {
-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {
-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Artifact_3093 == requestElementType) {
-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {
-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Signal_3095 == requestElementType) {
-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.UseCase_3096 == requestElementType) {
-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Comment_3097 == requestElementType) {
-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {
-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {
-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {
-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {
-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Constraint_3120 == requestElementType) {
-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class InteractionCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public InteractionCompositeCompartmentItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.Interaction_3073);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Parameter_3088 == requestElementType) {

+

+			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Property_3070 == requestElementType) {

+

+			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Activity_3072 == requestElementType) {

+

+			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interaction_3073 == requestElementType) {

+

+			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

+			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.StateMachine_3075 == requestElementType) {

+

+			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

+			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

+			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Component_3081 == requestElementType) {

+

+			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Device_3082 == requestElementType) {

+

+			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

+			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Node_3084 == requestElementType) {

+

+			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Class_3085 == requestElementType) {

+

+			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Collaboration_3086 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interface_3087 == requestElementType) {

+

+			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

+			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Enumeration_3079 == requestElementType) {

+

+			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DataType_3080 == requestElementType) {

+

+			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Actor_3091 == requestElementType) {

+

+			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

+			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Artifact_3093 == requestElementType) {

+

+			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InformationItem_3094 == requestElementType) {

+

+			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Signal_3095 == requestElementType) {

+

+			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.UseCase_3096 == requestElementType) {

+

+			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Comment_3097 == requestElementType) {

+

+			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

+			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

+			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

+			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

+			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Constraint_3120 == requestElementType) {

+

+			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicy.java
index 89c9ccb2460..309a759c0c0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicy.java
@@ -1,452 +1,425 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public InteractionCompositeItemSemanticEditPolicy() {
-		super(UMLElementTypes.Interaction_2061);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Port_3069 == requestElementType) {
-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Parameter_3088 == requestElementType) {
-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class InteractionCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public InteractionCompositeItemSemanticEditPolicy() {

+		super(UMLElementTypes.Interaction_2061);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Port_3069 == requestElementType) {

+

+			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Parameter_3088 == requestElementType) {

+

+			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicyCN.java
index 7e76cd9e740..cfbed7cb87d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionCompositeItemSemanticEditPolicyCN.java
@@ -1,452 +1,425 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public InteractionCompositeItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.Interaction_3073);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Port_3069 == requestElementType) {
-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Parameter_3088 == requestElementType) {
-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class InteractionCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public InteractionCompositeItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.Interaction_3073);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Port_3069 == requestElementType) {

+

+			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Parameter_3088 == requestElementType) {

+

+			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicy.java
index 82c21948637..798aebfc316 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicy.java
@@ -1,403 +1,372 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class InteractionConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public InteractionConstraintItemSemanticEditPolicy() {
-		super(UMLElementTypes.InteractionConstraint_2113);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class InteractionConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public InteractionConstraintItemSemanticEditPolicy() {

+		super(UMLElementTypes.InteractionConstraint_2113);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicyCN.java
index 43c6d12951c..7e1e219f775 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InteractionConstraintItemSemanticEditPolicyCN.java
@@ -1,403 +1,372 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class InteractionConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public InteractionConstraintItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.InteractionConstraint_3119);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class InteractionConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public InteractionConstraintItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.InteractionConstraint_3119);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicy.java
index 6e914e63207..e69939804ec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicy.java
@@ -1,431 +1,398 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class InterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public InterfaceItemSemanticEditPolicy() {
-		super(UMLElementTypes.Interface_2076);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class InterfaceItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public InterfaceItemSemanticEditPolicy() {

+		super(UMLElementTypes.Interface_2076);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicyCN.java
index b725a708401..bfecfae6e63 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceItemSemanticEditPolicyCN.java
@@ -1,431 +1,398 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class InterfaceItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public InterfaceItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.Interface_3087);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class InterfaceItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public InterfaceItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.Interface_3087);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java
index fe971d7579a..9379ef553cd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/InterfaceRealizationItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class InterfaceRealizationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public InterfaceRealizationItemSemanticEditPolicy() {
-		super(UMLElementTypes.InterfaceRealization_4005);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class InterfaceRealizationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public InterfaceRealizationItemSemanticEditPolicy() {

+		super(UMLElementTypes.InterfaceRealization_4005);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicy.java
index 20f9a0ce8a8..93d5cd4ee04 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicy.java
@@ -1,403 +1,372 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class IntervalConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public IntervalConstraintItemSemanticEditPolicy() {
-		super(UMLElementTypes.IntervalConstraint_2112);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class IntervalConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public IntervalConstraintItemSemanticEditPolicy() {

+		super(UMLElementTypes.IntervalConstraint_2112);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicyCN.java
index 90be5f11f90..b6878f0cc92 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalConstraintItemSemanticEditPolicyCN.java
@@ -1,403 +1,372 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class IntervalConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public IntervalConstraintItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.IntervalConstraint_3118);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class IntervalConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public IntervalConstraintItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.IntervalConstraint_3118);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalItemSemanticEditPolicy.java
index eef7d051deb..af13ce5dd44 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/IntervalItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class IntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public IntervalItemSemanticEditPolicy() {
-		super(UMLElementTypes.Interval_2107);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class IntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public IntervalItemSemanticEditPolicy() {

+		super(UMLElementTypes.Interval_2107);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralBooleanItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralBooleanItemSemanticEditPolicy.java
index a5afa7d6a63..4276f4b7fc9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralBooleanItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralBooleanItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class LiteralBooleanItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public LiteralBooleanItemSemanticEditPolicy() {
-		super(UMLElementTypes.LiteralBoolean_2095);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class LiteralBooleanItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public LiteralBooleanItemSemanticEditPolicy() {

+		super(UMLElementTypes.LiteralBoolean_2095);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralIntegerItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralIntegerItemSemanticEditPolicy.java
index 776653737a9..cc49118ecd4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralIntegerItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralIntegerItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class LiteralIntegerItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public LiteralIntegerItemSemanticEditPolicy() {
-		super(UMLElementTypes.LiteralInteger_2096);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class LiteralIntegerItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public LiteralIntegerItemSemanticEditPolicy() {

+		super(UMLElementTypes.LiteralInteger_2096);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralNullItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralNullItemSemanticEditPolicy.java
index b7a79dcf111..0364deb69f4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralNullItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralNullItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class LiteralNullItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public LiteralNullItemSemanticEditPolicy() {
-		super(UMLElementTypes.LiteralNull_2097);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class LiteralNullItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public LiteralNullItemSemanticEditPolicy() {

+		super(UMLElementTypes.LiteralNull_2097);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralStringItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralStringItemSemanticEditPolicy.java
index caac31af70a..7403882832a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralStringItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralStringItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class LiteralStringItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public LiteralStringItemSemanticEditPolicy() {
-		super(UMLElementTypes.LiteralString_2098);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class LiteralStringItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public LiteralStringItemSemanticEditPolicy() {

+		super(UMLElementTypes.LiteralString_2098);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralUnlimitedNaturalItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralUnlimitedNaturalItemSemanticEditPolicy.java
index ac4bdf7c907..c3961a6a125 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralUnlimitedNaturalItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/LiteralUnlimitedNaturalItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class LiteralUnlimitedNaturalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public LiteralUnlimitedNaturalItemSemanticEditPolicy() {
-		super(UMLElementTypes.LiteralUnlimitedNatural_2099);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class LiteralUnlimitedNaturalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public LiteralUnlimitedNaturalItemSemanticEditPolicy() {

+		super(UMLElementTypes.LiteralUnlimitedNatural_2099);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ManifestationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ManifestationItemSemanticEditPolicy.java
index 68efd5aeaa4..e4d6c702626 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ManifestationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ManifestationItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ManifestationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ManifestationItemSemanticEditPolicy() {
-		super(UMLElementTypes.Manifestation_4012);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ManifestationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ManifestationItemSemanticEditPolicy() {

+		super(UMLElementTypes.Manifestation_4012);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeCompartmentItemSemanticEditPolicy.java
index 12f3e380127..4aea8b58a1e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeCompartmentItemSemanticEditPolicy.java
@@ -1,161 +1,224 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class NodeCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public NodeCompositeCompartmentItemSemanticEditPolicy() {
-		super(UMLElementTypes.Node_2072);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Property_3070 == requestElementType) {
-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {
-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Activity_3072 == requestElementType) {
-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interaction_3073 == requestElementType) {
-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {
-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {
-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {
-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {
-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Component_3081 == requestElementType) {
-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Device_3082 == requestElementType) {
-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {
-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Node_3084 == requestElementType) {
-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Class_3085 == requestElementType) {
-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {
-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interface_3087 == requestElementType) {
-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {
-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {
-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DataType_3080 == requestElementType) {
-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Actor_3091 == requestElementType) {
-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {
-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Artifact_3093 == requestElementType) {
-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {
-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Signal_3095 == requestElementType) {
-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.UseCase_3096 == requestElementType) {
-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Comment_3097 == requestElementType) {
-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {
-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {
-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {
-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {
-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Constraint_3120 == requestElementType) {
-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class NodeCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public NodeCompositeCompartmentItemSemanticEditPolicy() {

+		super(UMLElementTypes.Node_2072);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Property_3070 == requestElementType) {

+

+			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Activity_3072 == requestElementType) {

+

+			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interaction_3073 == requestElementType) {

+

+			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

+			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.StateMachine_3075 == requestElementType) {

+

+			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

+			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

+			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Component_3081 == requestElementType) {

+

+			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Device_3082 == requestElementType) {

+

+			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

+			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Node_3084 == requestElementType) {

+

+			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Class_3085 == requestElementType) {

+

+			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Collaboration_3086 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interface_3087 == requestElementType) {

+

+			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

+			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Enumeration_3079 == requestElementType) {

+

+			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DataType_3080 == requestElementType) {

+

+			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Actor_3091 == requestElementType) {

+

+			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

+			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Artifact_3093 == requestElementType) {

+

+			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InformationItem_3094 == requestElementType) {

+

+			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Signal_3095 == requestElementType) {

+

+			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.UseCase_3096 == requestElementType) {

+

+			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Comment_3097 == requestElementType) {

+

+			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

+			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

+			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

+			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

+			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Constraint_3120 == requestElementType) {

+

+			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeCompartmentItemSemanticEditPolicyCN.java
index 5d62f063835..cbe78273550 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeCompartmentItemSemanticEditPolicyCN.java
@@ -1,161 +1,224 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class NodeCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public NodeCompositeCompartmentItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.Node_3084);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Property_3070 == requestElementType) {
-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {
-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Activity_3072 == requestElementType) {
-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interaction_3073 == requestElementType) {
-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {
-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {
-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {
-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {
-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Component_3081 == requestElementType) {
-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Device_3082 == requestElementType) {
-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {
-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Node_3084 == requestElementType) {
-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Class_3085 == requestElementType) {
-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {
-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interface_3087 == requestElementType) {
-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {
-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {
-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DataType_3080 == requestElementType) {
-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Actor_3091 == requestElementType) {
-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {
-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Artifact_3093 == requestElementType) {
-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {
-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Signal_3095 == requestElementType) {
-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.UseCase_3096 == requestElementType) {
-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Comment_3097 == requestElementType) {
-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {
-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {
-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {
-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {
-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Constraint_3120 == requestElementType) {
-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class NodeCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public NodeCompositeCompartmentItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.Node_3084);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Property_3070 == requestElementType) {

+

+			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Activity_3072 == requestElementType) {

+

+			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interaction_3073 == requestElementType) {

+

+			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

+			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.StateMachine_3075 == requestElementType) {

+

+			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

+			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

+			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Component_3081 == requestElementType) {

+

+			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Device_3082 == requestElementType) {

+

+			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

+			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Node_3084 == requestElementType) {

+

+			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Class_3085 == requestElementType) {

+

+			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Collaboration_3086 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interface_3087 == requestElementType) {

+

+			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

+			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Enumeration_3079 == requestElementType) {

+

+			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DataType_3080 == requestElementType) {

+

+			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Actor_3091 == requestElementType) {

+

+			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

+			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Artifact_3093 == requestElementType) {

+

+			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InformationItem_3094 == requestElementType) {

+

+			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Signal_3095 == requestElementType) {

+

+			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.UseCase_3096 == requestElementType) {

+

+			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Comment_3097 == requestElementType) {

+

+			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

+			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

+			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

+			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

+			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Constraint_3120 == requestElementType) {

+

+			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicy.java
index 9140839570f..4f495fd11a7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicy.java
@@ -1,448 +1,419 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public NodeCompositeItemSemanticEditPolicy() {
-		super(UMLElementTypes.Node_2072);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Port_3069 == requestElementType) {
-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class NodeCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public NodeCompositeItemSemanticEditPolicy() {

+		super(UMLElementTypes.Node_2072);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Port_3069 == requestElementType) {

+

+			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicycN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicycN.java
index 71b52ea825f..78f3d79356d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicycN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/NodeCompositeItemSemanticEditPolicycN.java
@@ -1,448 +1,419 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public NodeCompositeItemSemanticEditPolicycN() {
-		super(UMLElementTypes.Node_3084);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Port_3069 == requestElementType) {
-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class NodeCompositeItemSemanticEditPolicycN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public NodeCompositeItemSemanticEditPolicycN() {

+		super(UMLElementTypes.Node_3084);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Port_3069 == requestElementType) {

+

+			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy.java
index 446145fe599..dab8e20d3fb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy.java
@@ -1,165 +1,230 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy() {
-		super(UMLElementTypes.OpaqueBehavior_2065);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Parameter_3088 == requestElementType) {
-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Property_3070 == requestElementType) {
-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {
-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Activity_3072 == requestElementType) {
-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interaction_3073 == requestElementType) {
-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {
-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {
-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {
-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {
-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Component_3081 == requestElementType) {
-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Device_3082 == requestElementType) {
-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {
-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Node_3084 == requestElementType) {
-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Class_3085 == requestElementType) {
-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {
-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interface_3087 == requestElementType) {
-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {
-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {
-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DataType_3080 == requestElementType) {
-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Actor_3091 == requestElementType) {
-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {
-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Artifact_3093 == requestElementType) {
-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {
-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Signal_3095 == requestElementType) {
-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.UseCase_3096 == requestElementType) {
-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Comment_3097 == requestElementType) {
-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {
-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {
-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {
-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {
-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Constraint_3120 == requestElementType) {
-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicy() {

+		super(UMLElementTypes.OpaqueBehavior_2065);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Parameter_3088 == requestElementType) {

+

+			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Property_3070 == requestElementType) {

+

+			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Activity_3072 == requestElementType) {

+

+			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interaction_3073 == requestElementType) {

+

+			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

+			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.StateMachine_3075 == requestElementType) {

+

+			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

+			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

+			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Component_3081 == requestElementType) {

+

+			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Device_3082 == requestElementType) {

+

+			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

+			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Node_3084 == requestElementType) {

+

+			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Class_3085 == requestElementType) {

+

+			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Collaboration_3086 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interface_3087 == requestElementType) {

+

+			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

+			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Enumeration_3079 == requestElementType) {

+

+			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DataType_3080 == requestElementType) {

+

+			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Actor_3091 == requestElementType) {

+

+			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

+			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Artifact_3093 == requestElementType) {

+

+			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InformationItem_3094 == requestElementType) {

+

+			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Signal_3095 == requestElementType) {

+

+			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.UseCase_3096 == requestElementType) {

+

+			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Comment_3097 == requestElementType) {

+

+			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

+			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

+			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

+			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

+			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Constraint_3120 == requestElementType) {

+

+			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN.java
index 2a73c596358..326c0b89929 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN.java
@@ -1,165 +1,230 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.OpaqueBehavior_3077);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Parameter_3088 == requestElementType) {
-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Property_3070 == requestElementType) {
-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {
-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Activity_3072 == requestElementType) {
-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interaction_3073 == requestElementType) {
-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {
-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {
-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {
-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {
-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Component_3081 == requestElementType) {
-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Device_3082 == requestElementType) {
-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {
-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Node_3084 == requestElementType) {
-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Class_3085 == requestElementType) {
-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {
-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interface_3087 == requestElementType) {
-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {
-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {
-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DataType_3080 == requestElementType) {
-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Actor_3091 == requestElementType) {
-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {
-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Artifact_3093 == requestElementType) {
-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {
-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Signal_3095 == requestElementType) {
-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.UseCase_3096 == requestElementType) {
-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Comment_3097 == requestElementType) {
-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {
-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {
-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {
-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {
-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Constraint_3120 == requestElementType) {
-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public OpaqueBehaviorCompositeCompartmentItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.OpaqueBehavior_3077);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Parameter_3088 == requestElementType) {

+

+			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Property_3070 == requestElementType) {

+

+			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Activity_3072 == requestElementType) {

+

+			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interaction_3073 == requestElementType) {

+

+			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

+			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.StateMachine_3075 == requestElementType) {

+

+			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

+			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

+			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Component_3081 == requestElementType) {

+

+			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Device_3082 == requestElementType) {

+

+			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

+			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Node_3084 == requestElementType) {

+

+			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Class_3085 == requestElementType) {

+

+			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Collaboration_3086 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interface_3087 == requestElementType) {

+

+			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

+			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Enumeration_3079 == requestElementType) {

+

+			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DataType_3080 == requestElementType) {

+

+			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Actor_3091 == requestElementType) {

+

+			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

+			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Artifact_3093 == requestElementType) {

+

+			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InformationItem_3094 == requestElementType) {

+

+			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Signal_3095 == requestElementType) {

+

+			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.UseCase_3096 == requestElementType) {

+

+			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Comment_3097 == requestElementType) {

+

+			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

+			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

+			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

+			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

+			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Constraint_3120 == requestElementType) {

+

+			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicy.java
index 5440db44586..c88fd666c49 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicy.java
@@ -1,452 +1,425 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public OpaqueBehaviorCompositeItemSemanticEditPolicy() {
-		super(UMLElementTypes.OpaqueBehavior_2065);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Port_3069 == requestElementType) {
-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Parameter_3088 == requestElementType) {
-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class OpaqueBehaviorCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public OpaqueBehaviorCompositeItemSemanticEditPolicy() {

+		super(UMLElementTypes.OpaqueBehavior_2065);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Port_3069 == requestElementType) {

+

+			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Parameter_3088 == requestElementType) {

+

+			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicyCN.java
index 9a4dc88c266..aaf99cd4a76 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueBehaviorCompositeItemSemanticEditPolicyCN.java
@@ -1,452 +1,425 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public OpaqueBehaviorCompositeItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.OpaqueBehavior_3077);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Port_3069 == requestElementType) {
-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Parameter_3088 == requestElementType) {
-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class OpaqueBehaviorCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public OpaqueBehaviorCompositeItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.OpaqueBehavior_3077);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Port_3069 == requestElementType) {

+

+			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Parameter_3088 == requestElementType) {

+

+			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueExpressionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueExpressionItemSemanticEditPolicy.java
index 3a727291f93..eb1456f9133 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueExpressionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OpaqueExpressionItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class OpaqueExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public OpaqueExpressionItemSemanticEditPolicy() {
-		super(UMLElementTypes.OpaqueExpression_2101);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class OpaqueExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public OpaqueExpressionItemSemanticEditPolicy() {

+		super(UMLElementTypes.OpaqueExpression_2101);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OperationItemSemanticEditPolicyCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OperationItemSemanticEditPolicyCLN.java
index 3e2c9eec66e..8f1e812dc61 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OperationItemSemanticEditPolicyCLN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/OperationItemSemanticEditPolicyCLN.java
@@ -1,59 +1,60 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.DeleteCommand;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class OperationItemSemanticEditPolicyCLN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public OperationItemSemanticEditPolicyCLN() {
-		super(UMLElementTypes.Operation_3102);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		View view = (View) getHost().getModel();
-		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);
-		cmd.setTransactionNestingEnabled(true);
-		EAnnotation annotation = view.getEAnnotation("Shortcut");//$NON-NLS-1$
-		if (annotation == null) {
-			// there are indirectly referenced children, need extra commands: false
-			addDestroyShortcutsCommand(cmd, view);
-			// delete host element
-			List<EObject> todestroy = new ArrayList<EObject>();
-			todestroy.add(req.getElementToDestroy());
-			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));
-			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));
-		} else {
-			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));
-		}
-		return getGEFWrapper(cmd.reduce());
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class OperationItemSemanticEditPolicyCLN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public OperationItemSemanticEditPolicyCLN() {

+		super(UMLElementTypes.Operation_3102);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View)getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(true);

+		EAnnotation annotation = view.getEAnnotation("Shortcut");//$NON-NLS-1$

+		if(annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			List<EObject> todestroy = new ArrayList<EObject>();

+			todestroy.add(req.getElementToDestroy());

+			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

+		} else {

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ParameterItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ParameterItemSemanticEditPolicy.java
index 4c01a5dfeca..5abc1ac8b63 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ParameterItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ParameterItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ParameterItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ParameterItemSemanticEditPolicy() {
-		super(UMLElementTypes.Parameter_3088);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ParameterItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ParameterItemSemanticEditPolicy() {

+		super(UMLElementTypes.Parameter_3088);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PortItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PortItemSemanticEditPolicy.java
index fd93278bfbe..20bc29c6e44 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PortItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PortItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class PortItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public PortItemSemanticEditPolicy() {
-		super(UMLElementTypes.Port_3069);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class PortItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public PortItemSemanticEditPolicy() {

+		super(UMLElementTypes.Port_3069);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java
index 4f761751389..2dbf5d510ca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicy.java
@@ -1,431 +1,398 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class PrimitiveTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public PrimitiveTypeItemSemanticEditPolicy() {
-		super(UMLElementTypes.PrimitiveType_2066);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class PrimitiveTypeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public PrimitiveTypeItemSemanticEditPolicy() {

+		super(UMLElementTypes.PrimitiveType_2066);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java
index bd9a17d8253..ec104b64b31 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PrimitiveTypeItemSemanticEditPolicyCN.java
@@ -1,431 +1,398 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class PrimitiveTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public PrimitiveTypeItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.PrimitiveType_3078);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class PrimitiveTypeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public PrimitiveTypeItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.PrimitiveType_3078);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyItemSemanticEditPolicyCLN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyItemSemanticEditPolicyCLN.java
index 43dc0f486de..cce219ce1a7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyItemSemanticEditPolicyCLN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyItemSemanticEditPolicyCLN.java
@@ -1,59 +1,60 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.DeleteCommand;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class PropertyItemSemanticEditPolicyCLN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public PropertyItemSemanticEditPolicyCLN() {
-		super(UMLElementTypes.Property_3101);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		View view = (View) getHost().getModel();
-		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);
-		cmd.setTransactionNestingEnabled(true);
-		EAnnotation annotation = view.getEAnnotation("Shortcut");//$NON-NLS-1$
-		if (annotation == null) {
-			// there are indirectly referenced children, need extra commands: false
-			addDestroyShortcutsCommand(cmd, view);
-			// delete host element
-			List<EObject> todestroy = new ArrayList<EObject>();
-			todestroy.add(req.getElementToDestroy());
-			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));
-			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));
-		} else {
-			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));
-		}
-		return getGEFWrapper(cmd.reduce());
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.edit.command.DeleteCommand;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.commands.wrappers.EMFtoGMFCommandWrapper;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class PropertyItemSemanticEditPolicyCLN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public PropertyItemSemanticEditPolicyCLN() {

+		super(UMLElementTypes.Property_3101);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		View view = (View)getHost().getModel();

+		CompositeTransactionalCommand cmd = new CompositeTransactionalCommand(getEditingDomain(), null);

+		cmd.setTransactionNestingEnabled(true);

+		EAnnotation annotation = view.getEAnnotation("Shortcut");//$NON-NLS-1$

+		if(annotation == null) {

+			// there are indirectly referenced children, need extra commands: false

+			addDestroyShortcutsCommand(cmd, view);

+			// delete host element

+			List<EObject> todestroy = new ArrayList<EObject>();

+			todestroy.add(req.getElementToDestroy());

+			//cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));

+			cmd.add(new EMFtoGMFCommandWrapper(new DeleteCommand(getEditingDomain(), todestroy)));

+		} else {

+			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));

+		}

+		return getGEFWrapper(cmd.reduce());

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyPartCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyPartCompartmentItemSemanticEditPolicyCN.java
index fe08ca62f36..43fa2279f5e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyPartCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyPartCompartmentItemSemanticEditPolicyCN.java
@@ -1,49 +1,56 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class PropertyPartCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public PropertyPartCompartmentItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.Property_3070);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Property_3070 == requestElementType) {
-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Comment_3097 == requestElementType) {
-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class PropertyPartCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public PropertyPartCompartmentItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.Property_3070);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Property_3070 == requestElementType) {

+

+			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Comment_3097 == requestElementType) {

+

+			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyPartItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyPartItemSemanticEditPolicyCN.java
index aca101056b2..5f275524c1f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyPartItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/PropertyPartItemSemanticEditPolicyCN.java
@@ -1,416 +1,390 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class PropertyPartItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public PropertyPartItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.Property_3070);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Port_3069 == requestElementType) {
-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class PropertyPartItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public PropertyPartItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.Property_3070);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Port_3069 == requestElementType) {

+

+			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy.java
index 6045def9fa1..c24a4e624e7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy.java
@@ -1,165 +1,230 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy() {
-		super(UMLElementTypes.ProtocolStateMachine_2062);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Parameter_3088 == requestElementType) {
-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Property_3070 == requestElementType) {
-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {
-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Activity_3072 == requestElementType) {
-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interaction_3073 == requestElementType) {
-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {
-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {
-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {
-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {
-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Component_3081 == requestElementType) {
-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Device_3082 == requestElementType) {
-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {
-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Node_3084 == requestElementType) {
-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Class_3085 == requestElementType) {
-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {
-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interface_3087 == requestElementType) {
-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {
-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {
-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DataType_3080 == requestElementType) {
-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Actor_3091 == requestElementType) {
-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {
-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Artifact_3093 == requestElementType) {
-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {
-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Signal_3095 == requestElementType) {
-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.UseCase_3096 == requestElementType) {
-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Comment_3097 == requestElementType) {
-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {
-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {
-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {
-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {
-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Constraint_3120 == requestElementType) {
-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicy() {

+		super(UMLElementTypes.ProtocolStateMachine_2062);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Parameter_3088 == requestElementType) {

+

+			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Property_3070 == requestElementType) {

+

+			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Activity_3072 == requestElementType) {

+

+			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interaction_3073 == requestElementType) {

+

+			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

+			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.StateMachine_3075 == requestElementType) {

+

+			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

+			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

+			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Component_3081 == requestElementType) {

+

+			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Device_3082 == requestElementType) {

+

+			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

+			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Node_3084 == requestElementType) {

+

+			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Class_3085 == requestElementType) {

+

+			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Collaboration_3086 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interface_3087 == requestElementType) {

+

+			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

+			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Enumeration_3079 == requestElementType) {

+

+			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DataType_3080 == requestElementType) {

+

+			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Actor_3091 == requestElementType) {

+

+			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

+			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Artifact_3093 == requestElementType) {

+

+			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InformationItem_3094 == requestElementType) {

+

+			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Signal_3095 == requestElementType) {

+

+			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.UseCase_3096 == requestElementType) {

+

+			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Comment_3097 == requestElementType) {

+

+			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

+			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

+			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

+			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

+			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Constraint_3120 == requestElementType) {

+

+			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN.java
index 2a5452ca660..87b2fb34493 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN.java
@@ -1,165 +1,230 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.ProtocolStateMachine_3074);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Parameter_3088 == requestElementType) {
-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Property_3070 == requestElementType) {
-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {
-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Activity_3072 == requestElementType) {
-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interaction_3073 == requestElementType) {
-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {
-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {
-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {
-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {
-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Component_3081 == requestElementType) {
-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Device_3082 == requestElementType) {
-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {
-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Node_3084 == requestElementType) {
-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Class_3085 == requestElementType) {
-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {
-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interface_3087 == requestElementType) {
-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {
-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {
-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DataType_3080 == requestElementType) {
-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Actor_3091 == requestElementType) {
-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {
-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Artifact_3093 == requestElementType) {
-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {
-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Signal_3095 == requestElementType) {
-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.UseCase_3096 == requestElementType) {
-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Comment_3097 == requestElementType) {
-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {
-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {
-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {
-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {
-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Constraint_3120 == requestElementType) {
-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ProtocolStateMachineCompositeCompartmentItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.ProtocolStateMachine_3074);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Parameter_3088 == requestElementType) {

+

+			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Property_3070 == requestElementType) {

+

+			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Activity_3072 == requestElementType) {

+

+			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interaction_3073 == requestElementType) {

+

+			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

+			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.StateMachine_3075 == requestElementType) {

+

+			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

+			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

+			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Component_3081 == requestElementType) {

+

+			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Device_3082 == requestElementType) {

+

+			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

+			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Node_3084 == requestElementType) {

+

+			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Class_3085 == requestElementType) {

+

+			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Collaboration_3086 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interface_3087 == requestElementType) {

+

+			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

+			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Enumeration_3079 == requestElementType) {

+

+			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DataType_3080 == requestElementType) {

+

+			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Actor_3091 == requestElementType) {

+

+			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

+			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Artifact_3093 == requestElementType) {

+

+			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InformationItem_3094 == requestElementType) {

+

+			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Signal_3095 == requestElementType) {

+

+			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.UseCase_3096 == requestElementType) {

+

+			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Comment_3097 == requestElementType) {

+

+			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

+			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

+			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

+			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

+			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Constraint_3120 == requestElementType) {

+

+			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicy.java
index 82ba557157a..36f0e832e52 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicy.java
@@ -1,452 +1,425 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ProtocolStateMachineCompositeItemSemanticEditPolicy() {
-		super(UMLElementTypes.ProtocolStateMachine_2062);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Port_3069 == requestElementType) {
-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Parameter_3088 == requestElementType) {
-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ProtocolStateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ProtocolStateMachineCompositeItemSemanticEditPolicy() {

+		super(UMLElementTypes.ProtocolStateMachine_2062);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Port_3069 == requestElementType) {

+

+			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Parameter_3088 == requestElementType) {

+

+			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicyCN.java
index 04eb2abd5eb..88ca9d58747 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/ProtocolStateMachineCompositeItemSemanticEditPolicyCN.java
@@ -1,452 +1,425 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public ProtocolStateMachineCompositeItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.ProtocolStateMachine_3074);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Port_3069 == requestElementType) {
-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Parameter_3088 == requestElementType) {
-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class ProtocolStateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public ProtocolStateMachineCompositeItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.ProtocolStateMachine_3074);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Port_3069 == requestElementType) {

+

+			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Parameter_3088 == requestElementType) {

+

+			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RealizationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RealizationItemSemanticEditPolicy.java
index 2691b1d1b2e..710012a2334 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RealizationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RealizationItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class RealizationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public RealizationItemSemanticEditPolicy() {
-		super(UMLElementTypes.Realization_4006);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class RealizationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public RealizationItemSemanticEditPolicy() {

+		super(UMLElementTypes.Realization_4006);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RepresentationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RepresentationItemSemanticEditPolicy.java
index 1b586337dd1..a5cca03fc43 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RepresentationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RepresentationItemSemanticEditPolicy.java
@@ -1,36 +1,37 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class RepresentationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public RepresentationItemSemanticEditPolicy() {
-		super(UMLElementTypes.InformationItemRepresented_4020);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {
-		return getGEFWrapper(new DestroyReferenceCommand(req));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class RepresentationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public RepresentationItemSemanticEditPolicy() {

+		super(UMLElementTypes.InformationItemRepresented_4020);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {

+		return getGEFWrapper(new DestroyReferenceCommand(req));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RoleBindingItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RoleBindingItemSemanticEditPolicy.java
index 5a7bfd01095..0a1bf4288ee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RoleBindingItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/RoleBindingItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class RoleBindingItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public RoleBindingItemSemanticEditPolicy() {
-		super(UMLElementTypes.Dependency_4017);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class RoleBindingItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public RoleBindingItemSemanticEditPolicy() {

+		super(UMLElementTypes.Dependency_4017);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalEventItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalEventItemSemanticEditPolicy.java
index 5a2d40ba482..9de70f7a1ba 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalEventItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalEventItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class SignalEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public SignalEventItemSemanticEditPolicy() {
-		super(UMLElementTypes.SignalEvent_2083);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class SignalEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SignalEventItemSemanticEditPolicy() {

+		super(UMLElementTypes.SignalEvent_2083);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalItemSemanticEditPolicy.java
index 21dfc790a9b..6dd1d989bb7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalItemSemanticEditPolicy.java
@@ -1,431 +1,398 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class SignalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public SignalItemSemanticEditPolicy() {
-		super(UMLElementTypes.Signal_2081);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class SignalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SignalItemSemanticEditPolicy() {

+		super(UMLElementTypes.Signal_2081);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalItemSemanticEditPolicyCN.java
index ff6171b1829..aae5bed57d4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SignalItemSemanticEditPolicyCN.java
@@ -1,431 +1,398 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class SignalItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public SignalItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.Signal_3095);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class SignalItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SignalItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.Signal_3095);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeCompartmentItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeCompartmentItemSemanticEditPolicy.java
index b43f3794263..34560d5e53c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeCompartmentItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeCompartmentItemSemanticEditPolicy.java
@@ -1,165 +1,230 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class StateMachineCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public StateMachineCompositeCompartmentItemSemanticEditPolicy() {
-		super(UMLElementTypes.StateMachine_2063);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Parameter_3088 == requestElementType) {
-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Property_3070 == requestElementType) {
-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {
-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Activity_3072 == requestElementType) {
-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interaction_3073 == requestElementType) {
-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {
-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {
-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {
-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {
-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Component_3081 == requestElementType) {
-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Device_3082 == requestElementType) {
-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {
-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Node_3084 == requestElementType) {
-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Class_3085 == requestElementType) {
-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {
-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interface_3087 == requestElementType) {
-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {
-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {
-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DataType_3080 == requestElementType) {
-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Actor_3091 == requestElementType) {
-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {
-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Artifact_3093 == requestElementType) {
-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {
-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Signal_3095 == requestElementType) {
-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.UseCase_3096 == requestElementType) {
-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Comment_3097 == requestElementType) {
-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {
-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {
-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {
-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {
-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Constraint_3120 == requestElementType) {
-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class StateMachineCompositeCompartmentItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public StateMachineCompositeCompartmentItemSemanticEditPolicy() {

+		super(UMLElementTypes.StateMachine_2063);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Parameter_3088 == requestElementType) {

+

+			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Property_3070 == requestElementType) {

+

+			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Activity_3072 == requestElementType) {

+

+			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interaction_3073 == requestElementType) {

+

+			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

+			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.StateMachine_3075 == requestElementType) {

+

+			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

+			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

+			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Component_3081 == requestElementType) {

+

+			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Device_3082 == requestElementType) {

+

+			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

+			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Node_3084 == requestElementType) {

+

+			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Class_3085 == requestElementType) {

+

+			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Collaboration_3086 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interface_3087 == requestElementType) {

+

+			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

+			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Enumeration_3079 == requestElementType) {

+

+			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DataType_3080 == requestElementType) {

+

+			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Actor_3091 == requestElementType) {

+

+			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

+			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Artifact_3093 == requestElementType) {

+

+			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InformationItem_3094 == requestElementType) {

+

+			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Signal_3095 == requestElementType) {

+

+			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.UseCase_3096 == requestElementType) {

+

+			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Comment_3097 == requestElementType) {

+

+			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

+			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

+			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

+			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

+			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Constraint_3120 == requestElementType) {

+

+			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeCompartmentItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeCompartmentItemSemanticEditPolicyCN.java
index 73891c0466e..c1f5abcfc58 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeCompartmentItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeCompartmentItemSemanticEditPolicyCN.java
@@ -1,165 +1,230 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class StateMachineCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public StateMachineCompositeCompartmentItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.StateMachine_3075);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Parameter_3088 == requestElementType) {
-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Property_3070 == requestElementType) {
-			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.CollaborationUse_3071 == requestElementType) {
-			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Activity_3072 == requestElementType) {
-			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interaction_3073 == requestElementType) {
-			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {
-			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.StateMachine_3075 == requestElementType) {
-			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.FunctionBehavior_3076 == requestElementType) {
-			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {
-			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Component_3081 == requestElementType) {
-			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Device_3082 == requestElementType) {
-			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {
-			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Node_3084 == requestElementType) {
-			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Class_3085 == requestElementType) {
-			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Collaboration_3086 == requestElementType) {
-			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Interface_3087 == requestElementType) {
-			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.PrimitiveType_3078 == requestElementType) {
-			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Enumeration_3079 == requestElementType) {
-			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DataType_3080 == requestElementType) {
-			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Actor_3091 == requestElementType) {
-			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {
-			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Artifact_3093 == requestElementType) {
-			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InformationItem_3094 == requestElementType) {
-			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Signal_3095 == requestElementType) {
-			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.UseCase_3096 == requestElementType) {
-			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Comment_3097 == requestElementType) {
-			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.DurationConstraint_3116 == requestElementType) {
-			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.TimeConstraint_3117 == requestElementType) {
-			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.IntervalConstraint_3118 == requestElementType) {
-			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.InteractionConstraint_3119 == requestElementType) {
-			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Constraint_3120 == requestElementType) {
-			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActivityCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ActorCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ArtifactCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ClassCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CollaborationUseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DataTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentSpecificationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeviceCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.EnumerationCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ExecutionEnvironmentCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.FunctionBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationItemCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InteractionConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.IntervalConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.NodeCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.OpaqueBehaviorCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PrimitiveTypeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PropertyPartCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ProtocolStateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SignalCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.StateMachineCompositeCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeConstraintCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UseCaseCreateCommandCN;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class StateMachineCompositeCompartmentItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public StateMachineCompositeCompartmentItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.StateMachine_3075);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Parameter_3088 == requestElementType) {

+

+			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Property_3070 == requestElementType) {

+

+			return getGEFWrapper(new PropertyPartCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.CollaborationUse_3071 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationUseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Activity_3072 == requestElementType) {

+

+			return getGEFWrapper(new ActivityCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interaction_3073 == requestElementType) {

+

+			return getGEFWrapper(new InteractionCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ProtocolStateMachine_3074 == requestElementType) {

+

+			return getGEFWrapper(new ProtocolStateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.StateMachine_3075 == requestElementType) {

+

+			return getGEFWrapper(new StateMachineCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.FunctionBehavior_3076 == requestElementType) {

+

+			return getGEFWrapper(new FunctionBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.OpaqueBehavior_3077 == requestElementType) {

+

+			return getGEFWrapper(new OpaqueBehaviorCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Component_3081 == requestElementType) {

+

+			return getGEFWrapper(new ComponentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Device_3082 == requestElementType) {

+

+			return getGEFWrapper(new DeviceCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.ExecutionEnvironment_3083 == requestElementType) {

+

+			return getGEFWrapper(new ExecutionEnvironmentCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Node_3084 == requestElementType) {

+

+			return getGEFWrapper(new NodeCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Class_3085 == requestElementType) {

+

+			return getGEFWrapper(new ClassCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Collaboration_3086 == requestElementType) {

+

+			return getGEFWrapper(new CollaborationCompositeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Interface_3087 == requestElementType) {

+

+			return getGEFWrapper(new InterfaceCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.PrimitiveType_3078 == requestElementType) {

+

+			return getGEFWrapper(new PrimitiveTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Enumeration_3079 == requestElementType) {

+

+			return getGEFWrapper(new EnumerationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DataType_3080 == requestElementType) {

+

+			return getGEFWrapper(new DataTypeCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Actor_3091 == requestElementType) {

+

+			return getGEFWrapper(new ActorCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DeploymentSpecification_3092 == requestElementType) {

+

+			return getGEFWrapper(new DeploymentSpecificationCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Artifact_3093 == requestElementType) {

+

+			return getGEFWrapper(new ArtifactCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InformationItem_3094 == requestElementType) {

+

+			return getGEFWrapper(new InformationItemCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Signal_3095 == requestElementType) {

+

+			return getGEFWrapper(new SignalCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.UseCase_3096 == requestElementType) {

+

+			return getGEFWrapper(new UseCaseCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Comment_3097 == requestElementType) {

+

+			return getGEFWrapper(new CommentCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.DurationConstraint_3116 == requestElementType) {

+

+			return getGEFWrapper(new DurationConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.TimeConstraint_3117 == requestElementType) {

+

+			return getGEFWrapper(new TimeConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.IntervalConstraint_3118 == requestElementType) {

+

+			return getGEFWrapper(new IntervalConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.InteractionConstraint_3119 == requestElementType) {

+

+			return getGEFWrapper(new InteractionConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Constraint_3120 == requestElementType) {

+

+			return getGEFWrapper(new ConstraintCreateCommandCN(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicy.java
index 95589a275f4..71d07b29235 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicy.java
@@ -1,452 +1,425 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public StateMachineCompositeItemSemanticEditPolicy() {
-		super(UMLElementTypes.StateMachine_2063);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Port_3069 == requestElementType) {
-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Parameter_3088 == requestElementType) {
-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class StateMachineCompositeItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public StateMachineCompositeItemSemanticEditPolicy() {

+		super(UMLElementTypes.StateMachine_2063);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Port_3069 == requestElementType) {

+

+			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Parameter_3088 == requestElementType) {

+

+			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicyCN.java
index 3b4737321d9..0303630f0a5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StateMachineCompositeItemSemanticEditPolicyCN.java
@@ -1,452 +1,425 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public StateMachineCompositeItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.StateMachine_3075);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return super.getCreateCommand(req);
-		}
-		if (UMLElementTypes.Port_3069 == requestElementType) {
-			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		if (UMLElementTypes.Parameter_3088 == requestElementType) {
-			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));
-		}
-		return super.getCreateCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ParameterCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.PortCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class StateMachineCompositeItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public StateMachineCompositeItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.StateMachine_3075);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return super.getCreateCommand(req);

+		}

+

+

+		if(UMLElementTypes.Port_3069 == requestElementType) {

+

+			return getGEFWrapper(new PortCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		if(UMLElementTypes.Parameter_3088 == requestElementType) {

+

+			return getGEFWrapper(new ParameterCreateCommand(req, DiagramUtils.getDiagramFrom(getHost())));

+

+		}

+		return super.getCreateCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StringExpressionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StringExpressionItemSemanticEditPolicy.java
index b4a7fdc4ea4..225e90b4cec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StringExpressionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/StringExpressionItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class StringExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public StringExpressionItemSemanticEditPolicy() {
-		super(UMLElementTypes.StringExpression_2100);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class StringExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public StringExpressionItemSemanticEditPolicy() {

+		super(UMLElementTypes.StringExpression_2100);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SubstitutionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SubstitutionItemSemanticEditPolicy.java
index 8987e570e74..7472ff4ab29 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SubstitutionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/SubstitutionItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class SubstitutionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public SubstitutionItemSemanticEditPolicy() {
-		super(UMLElementTypes.Substitution_4011);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class SubstitutionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public SubstitutionItemSemanticEditPolicy() {

+		super(UMLElementTypes.Substitution_4011);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicy.java
index bcd414fffb3..034e8c11bde 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicy.java
@@ -1,403 +1,372 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class TimeConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public TimeConstraintItemSemanticEditPolicy() {
-		super(UMLElementTypes.TimeConstraint_2111);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class TimeConstraintItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public TimeConstraintItemSemanticEditPolicy() {

+		super(UMLElementTypes.TimeConstraint_2111);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicyCN.java
index 4984766c668..c53f6c96596 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeConstraintItemSemanticEditPolicyCN.java
@@ -1,403 +1,372 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class TimeConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public TimeConstraintItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.TimeConstraint_3117);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class TimeConstraintItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public TimeConstraintItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.TimeConstraint_3117);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeEventItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeEventItemSemanticEditPolicy.java
index 4055b12997f..97e3635acc5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeEventItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeEventItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class TimeEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public TimeEventItemSemanticEditPolicy() {
-		super(UMLElementTypes.TimeEvent_2089);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class TimeEventItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public TimeEventItemSemanticEditPolicy() {

+		super(UMLElementTypes.TimeEvent_2089);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeExpressionItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeExpressionItemSemanticEditPolicy.java
index ffa5e702aa5..bc760961df3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeExpressionItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeExpressionItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class TimeExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public TimeExpressionItemSemanticEditPolicy() {
-		super(UMLElementTypes.TimeExpression_2102);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class TimeExpressionItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public TimeExpressionItemSemanticEditPolicy() {

+		super(UMLElementTypes.TimeExpression_2102);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeIntervalItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeIntervalItemSemanticEditPolicy.java
index 31e8f139495..c8b16899a02 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeIntervalItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeIntervalItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class TimeIntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public TimeIntervalItemSemanticEditPolicy() {
-		super(UMLElementTypes.TimeInterval_2105);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class TimeIntervalItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public TimeIntervalItemSemanticEditPolicy() {

+		super(UMLElementTypes.TimeInterval_2105);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeObservationEventSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeObservationEventSemanticEditPolicy.java
index 0a2a2bdff4b..82f349ca576 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeObservationEventSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeObservationEventSemanticEditPolicy.java
@@ -1,36 +1,37 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class TimeObservationEventSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public TimeObservationEventSemanticEditPolicy() {
-		super(UMLElementTypes.TimeObservationEvent_4018);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {
-		return getGEFWrapper(new DestroyReferenceCommand(req));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class TimeObservationEventSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public TimeObservationEventSemanticEditPolicy() {

+		super(UMLElementTypes.TimeObservationEvent_4018);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {

+		return getGEFWrapper(new DestroyReferenceCommand(req));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeObservationItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeObservationItemSemanticEditPolicy.java
index c3020a99134..890bdbc50b6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeObservationItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/TimeObservationItemSemanticEditPolicy.java
@@ -1,403 +1,372 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class TimeObservationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public TimeObservationItemSemanticEditPolicy() {
-		super(UMLElementTypes.TimeObservation_2094);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class TimeObservationItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public TimeObservationItemSemanticEditPolicy() {

+		super(UMLElementTypes.TimeObservation_2094);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLBaseItemSemanticEditPolicy.java
index 09ab0087be8..88e3f50d3fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLBaseItemSemanticEditPolicy.java
@@ -1,925 +1,817 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gef.requests.ReconnectRequest;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;
-import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.SemanticEditPolicy;
-import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.commands.MoveElementsCommand;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.edit.helpers.GeneratedEditHelperBase;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.uml2.uml.Abstraction;
-import org.eclipse.uml2.uml.ActivityNode;
-import org.eclipse.uml2.uml.ActivityPartition;
-import org.eclipse.uml2.uml.Actor;
-import org.eclipse.uml2.uml.Artifact;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Classifier;
-import org.eclipse.uml2.uml.CollaborationUse;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.uml2.uml.Component;
-import org.eclipse.uml2.uml.ComponentRealization;
-import org.eclipse.uml2.uml.ConnectableElement;
-import org.eclipse.uml2.uml.Connector;
-import org.eclipse.uml2.uml.ConnectorEnd;
-import org.eclipse.uml2.uml.Constraint;
-import org.eclipse.uml2.uml.Dependency;
-import org.eclipse.uml2.uml.Deployment;
-import org.eclipse.uml2.uml.DurationObservation;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Generalization;
-import org.eclipse.uml2.uml.InformationFlow;
-import org.eclipse.uml2.uml.InformationItem;
-import org.eclipse.uml2.uml.InstanceSpecification;
-import org.eclipse.uml2.uml.Interface;
-import org.eclipse.uml2.uml.InterfaceRealization;
-import org.eclipse.uml2.uml.Manifestation;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Node;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.Realization;
-import org.eclipse.uml2.uml.Relationship;
-import org.eclipse.uml2.uml.Signal;
-import org.eclipse.uml2.uml.StructuredClassifier;
-import org.eclipse.uml2.uml.Substitution;
-import org.eclipse.uml2.uml.TimeObservation;
-import org.eclipse.uml2.uml.Usage;
-import org.eclipse.uml2.uml.UseCase;
-
-/**
- * @generated
- */
-public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {
-	/**
-	 * Extended request data key to hold editpart visual id.
-	 * @generated
-	 */
-	public static final String VISUAL_ID_KEY = "visual_id"; //$NON-NLS-1$
-	/**
-	 * Extended request data key to hold the edge view during a reconnect request.
-	 * @generated
-	 */
-	public static final String GRAPHICAL_RECONNECTED_EDGE = "graphical_edge"; //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final IElementType myElementType;
-
-	/**
-	 * @generated
-	 */
-	protected UMLBaseItemSemanticEditPolicy(IElementType elementType) {
-		myElementType = elementType;
-	}
-
-	/**
-	 * Extended request data key to hold editpart visual id.
-	 * Add visual id of edited editpart to extended data of the request
-	 * so command switch can decide what kind of diagram element is being edited.
-	 * It is done in those cases when it's not possible to deduce diagram
-	 * element kind from domain element.
-	 * Add the reoriented view to the request extended data so that the view
-	 *  currently edited can be distinguished from other views of the same element
-	 *  and these latter possibly removed if they become inconsistent after reconnect
-	 * 
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	public Command getCommand(Request request) {
-		if (request instanceof ReconnectRequest) {
-			Object view = ((ReconnectRequest) request).getConnectionEditPart().getModel();
-			if (view instanceof View) {
-				Integer id = new Integer(UMLVisualIDRegistry.getVisualID((View) view));
-				request.getExtendedData().put(VISUAL_ID_KEY, id);
-				request.getExtendedData().put(GRAPHICAL_RECONNECTED_EDGE, (View) view);
-			}
-		}
-		return super.getCommand(request);
-	}
-
-	/**
-	 * Returns visual id from request parameters.
-	 * @generated
-	 */
-	protected int getVisualID(IEditCommandRequest request) {
-		Object id = request.getParameter(VISUAL_ID_KEY);
-		return id instanceof Integer ? ((Integer) id).intValue() : -1;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getSemanticCommand(IEditCommandRequest request) {
-		IEditCommandRequest completedRequest = completeRequest(request);
-		Command semanticCommand = getSemanticCommandSwitch(completedRequest);
-		semanticCommand = getEditHelperCommand(completedRequest, semanticCommand);
-		if (completedRequest instanceof DestroyRequest) {
-			DestroyRequest destroyRequest = (DestroyRequest) completedRequest;
-			return shouldProceed(destroyRequest) ? addDeleteViewCommand(semanticCommand, destroyRequest) : null;
-		}
-		return semanticCommand;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command addDeleteViewCommand(Command mainCommand, DestroyRequest completedRequest) {
-		Command deleteViewCommand = getGEFWrapper(new DeleteCommand(getEditingDomain(), (View) getHost().getModel()));
-		return mainCommand == null ? deleteViewCommand : mainCommand.chain(deleteViewCommand);
-	}
-
-	/**
-	 * @generated
-	 */
-	private Command getEditHelperCommand(IEditCommandRequest request, Command editPolicyCommand) {
-		if (editPolicyCommand != null) {
-			ICommand command = editPolicyCommand instanceof ICommandProxy ? ((ICommandProxy) editPolicyCommand).getICommand() : new CommandProxy(editPolicyCommand);
-			request.setParameter(GeneratedEditHelperBase.EDIT_POLICY_COMMAND, command);
-		}
-		IElementType requestContextElementType = getContextElementType(request);
-		request.setParameter(GeneratedEditHelperBase.CONTEXT_ELEMENT_TYPE, requestContextElementType);
-		ICommand command = requestContextElementType.getEditCommand(request);
-		request.setParameter(GeneratedEditHelperBase.EDIT_POLICY_COMMAND, null);
-		request.setParameter(GeneratedEditHelperBase.CONTEXT_ELEMENT_TYPE, null);
-		if (command != null) {
-			if (!(command instanceof CompositeTransactionalCommand)) {
-				command = new CompositeTransactionalCommand(getEditingDomain(), command.getLabel()).compose(command);
-			}
-			return new ICommandProxy(command);
-		}
-		return editPolicyCommand;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IElementType getContextElementType(IEditCommandRequest request) {
-		IElementType requestContextElementType = UMLElementTypes.getElementType(getVisualID(request));
-		return requestContextElementType != null ? requestContextElementType : myElementType;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getSemanticCommandSwitch(IEditCommandRequest req) {
-		if (req instanceof CreateRelationshipRequest) {
-			return getCreateRelationshipCommand((CreateRelationshipRequest) req);
-		} else if (req instanceof CreateElementRequest) {
-			return getCreateCommand((CreateElementRequest) req);
-		} else if (req instanceof ConfigureRequest) {
-			return getConfigureCommand((ConfigureRequest) req);
-		} else if (req instanceof DestroyElementRequest) {
-			return getDestroyElementCommand((DestroyElementRequest) req);
-		} else if (req instanceof DestroyReferenceRequest) {
-			return getDestroyReferenceCommand((DestroyReferenceRequest) req);
-		} else if (req instanceof DuplicateElementsRequest) {
-			return getDuplicateCommand((DuplicateElementsRequest) req);
-		} else if (req instanceof GetEditContextRequest) {
-			return getEditContextCommand((GetEditContextRequest) req);
-		} else if (req instanceof MoveRequest) {
-			return getMoveCommand((MoveRequest) req);
-		} else if (req instanceof ReorientReferenceRelationshipRequest) {
-			return getReorientReferenceRelationshipCommand((ReorientReferenceRelationshipRequest) req);
-		} else if (req instanceof ReorientRelationshipRequest) {
-			return getReorientRelationshipCommand((ReorientRelationshipRequest) req);
-		} else if (req instanceof SetRequest) {
-			return getSetCommand((SetRequest) req);
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getConfigureCommand(ConfigureRequest req) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateCommand(CreateElementRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			// try to get a semantic create command from the extended type
-			IElementEditService commandProvider = ElementEditServiceUtils.getCommandProvider(req.getContainer());
-			if (commandProvider != null) {
-				ICommand command = commandProvider.getEditCommand(req);
-				if (command != null && command.canExecute()) {
-					return new ICommandProxy(command);
-				}
-			}
-		}
-		return null;
-	}
-
-	// RS: add code for extended types
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedTypeCreationCommand(CreateElementRequest request, IExtendedHintedElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(request.getContainer());
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedStartCreateRelationshipCommand(CreateElementRequest request, IExtendedHintedElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getExtendedCompleteCreateRelationshipCommand(CreateElementRequest request, IExtendedHintedElementType requestElementType) {
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);
-		if (provider == null) {
-			return UnexecutableCommand.INSTANCE;
-		}
-		// Retrieve create command from the Element Edit service
-		ICommand createGMFCommand = provider.getEditCommand(request);
-		return getGEFWrapper(createGMFCommand);
-	}
-
-	// RS: End of add code for extended types
-	/**
-	 * @generated
-	 */
-	protected Command getSetCommand(SetRequest req) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getEditContextCommand(GetEditContextRequest req) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDuplicateCommand(DuplicateElementsRequest req) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getMoveCommand(MoveRequest req) {
-		EObject targetCEObject = req.getTargetContainer();
-		if (targetCEObject != null) {
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetCEObject);
-			if (provider != null) {
-				ICommand moveCommand = provider.getEditCommand(req);
-				if (moveCommand != null) {
-					return new ICommandProxy(moveCommand);
-				}
-			}
-			return UnexecutableCommand.INSTANCE;
-		} else {
-			return getGEFWrapper(new MoveElementsCommand(req));
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected final Command getGEFWrapper(ICommand cmd) {
-		return new ICommandProxy(cmd);
-	}
-
-	/**
-	 * Returns editing domain from the host edit part.
-	 * @generated
-	 */
-	protected TransactionalEditingDomain getEditingDomain() {
-		return ((IGraphicalEditPart) getHost()).getEditingDomain();
-	}
-
-	/**
-	 * Clean all shortcuts to the host element from the same diagram
-	 * @generated
-	 */
-	protected void addDestroyShortcutsCommand(ICompositeCommand cmd, View view) {
-		assert view.getEAnnotation("Shortcut") == null; //$NON-NLS-1$
-		for (Iterator<?> it = view.getDiagram().getChildren().iterator(); it.hasNext();) {
-			View nextView = (View) it.next();
-			if (nextView.getEAnnotation("Shortcut") == null || !nextView.isSetElement() || nextView.getElement() != view.getElement()) { //$NON-NLS-1$
-				continue;
-			}
-			cmd.add(new DeleteCommand(getEditingDomain(), nextView));
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public static LinkConstraints getLinkConstraints() {
-		LinkConstraints cached = UMLDiagramEditorPlugin.getInstance().getLinkConstraints();
-		if (cached == null) {
-			UMLDiagramEditorPlugin.getInstance().setLinkConstraints(cached = new LinkConstraints());
-		}
-		return cached;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static class LinkConstraints {
-		/**
-		 * @generated
-		 */
-		public LinkConstraints() { // use static method #getLinkConstraints() to access instance
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateLink_4022(
-				) {
-			return canExistLink_4022();
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateLink_4001(
-				) {
-			return canExistLink_4001();
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateCommentAnnotatedElement_4002(
-				Comment source, Element target
-				) {
-			if (source != null) {
-				if (source.getAnnotatedElements()
-						.contains(target)) {
-					return false;
-				}
-			}
-			return canExistCommentAnnotatedElement_4002(
-					source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateConstraintConstrainedElement_4003(
-				Constraint source, Element target
-				) {
-			if (source != null) {
-				if (source.getConstrainedElements()
-						.contains(target)) {
-					return false;
-				}
-			}
-			return canExistConstraintConstrainedElement_4003(
-					source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateComponentRealization_4004(
-				Package container, NamedElement source, NamedElement target
-				) {
-			return canExistComponentRealization_4004(
-					container, null, source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateInterfaceRealization_4005(
-				Package container, NamedElement source, NamedElement target
-				) {
-			return canExistInterfaceRealization_4005(
-					container, null, source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateSubstitution_4011(
-				Package container, NamedElement source, NamedElement target
-				) {
-			return canExistSubstitution_4011(
-					container, null, source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateRealization_4006(
-				Package container, NamedElement source, NamedElement target
-				) {
-			return canExistRealization_4006(
-					container, null, source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateManifestation_4012(
-				Package container, NamedElement source, NamedElement target
-				) {
-			return canExistManifestation_4012(
-					container, null, source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateAbstraction_4007(
-				Package container, NamedElement source, NamedElement target
-				) {
-			return canExistAbstraction_4007(
-					container, null, source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateUsage_4008(
-				Package container, NamedElement source, NamedElement target
-				) {
-			return canExistUsage_4008(
-					container, null, source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateDeployment_4009(
-				Package container, NamedElement source, NamedElement target
-				) {
-			return canExistDeployment_4009(
-					container, null, source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateDependency_4017(
-				Package container, NamedElement source, NamedElement target
-				) {
-			return canExistDependency_4017(
-					container, null, source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateDependency_4010(
-				Package container, NamedElement source, NamedElement target
-				) {
-			return canExistDependency_4010(
-					container, null, source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateConnector_4013(
-				StructuredClassifier container, ConnectorEnd source, ConnectorEnd target
-				) {
-			return canExistConnector_4013(
-					container, null, source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateGeneralization_4015(
-				Classifier container, Classifier source, Classifier target
-				) {
-			return canExistGeneralization_4015(
-					container, null, source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateTimeObservationEvent_4018(
-				TimeObservation source, NamedElement target
-				) {
-			if (source != null) {
-				if (source.getEvent()
-					!= null) {
-					return false;
-				}
-			}
-			return canExistTimeObservationEvent_4018(
-					source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateDurationObservationEvent_4019(
-				DurationObservation source, NamedElement target
-				) {
-			if (source != null) {
-				if (source.getEvents()
-						.size() >= 2
-						||
-						source.getEvents()
-								.contains(target)) {
-					return false;
-				}
-			}
-			return canExistDurationObservationEvent_4019(
-					source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateInformationItemRepresented_4020(
-				InformationItem source, Classifier target
-				) {
-			if (source != null) {
-				if (source.getRepresenteds()
-						.contains(target)) {
-					return false;
-				}
-			}
-			return canExistInformationItemRepresented_4020(
-					source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canCreateInformationFlow_4021(
-				Package container, NamedElement source, NamedElement target
-				) {
-			return canExistInformationFlow_4021(
-					container, null, source, target);
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistLink_4022(
-				) {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistLink_4001(
-				) {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistCommentAnnotatedElement_4002(
-				Comment source, Element target
-				) {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistConstraintConstrainedElement_4003(
-				Constraint source, Element target
-				) {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistComponentRealization_4004(
-				Package container, ComponentRealization linkInstance, NamedElement source, NamedElement target
-				) {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistInterfaceRealization_4005(
-				Package container, InterfaceRealization linkInstance, NamedElement source, NamedElement target
-				) {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistSubstitution_4011(
-				Package container, Substitution linkInstance, NamedElement source, NamedElement target
-				) {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistRealization_4006(
-				Package container, Realization linkInstance, NamedElement source, NamedElement target
-				) {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistManifestation_4012(
-				Package container, Manifestation linkInstance, NamedElement source, NamedElement target
-				) {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistAbstraction_4007(
-				Package container, Abstraction linkInstance, NamedElement source, NamedElement target
-				) {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistUsage_4008(
-				Package container, Usage linkInstance, NamedElement source, NamedElement target
-				) {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistDeployment_4009(
-				Package container, Deployment linkInstance, NamedElement source, NamedElement target
-				) {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistDependency_4017(
-				Package container, Dependency linkInstance, NamedElement source, NamedElement target
-				) {
-			try {
-				// RoleBinding source constraint
-				if ((source != null) && !(source instanceof CollaborationUse)) {
-					return false;
-				}
-				// RoleBinding source has a type
-				if ((source != null) && (((CollaborationUse) source).getType() == null)) {
-					return false;
-				}
-				// RoleBinding target constraint
-				if ((target != null) && !(target instanceof ConnectableElement)) {
-					return false;
-				}
-				// RoleBinding source and target have the same semantic parent
-				if ((source != null) && (target != null) && (source.getOwner() != target.getOwner())) {
-					return false;
-				}
-				return true;
-			} catch (Exception e) {
-				UMLDiagramEditorPlugin.getInstance().logError("Link constraint evaluation error", e); //$NON-NLS-1$
-				return false;
-			}
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistDependency_4010(
-				Package container, Dependency linkInstance, NamedElement source, NamedElement target
-				) {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistConnector_4013(
-				StructuredClassifier container, Connector linkInstance, ConnectorEnd source, ConnectorEnd target
-				) {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistGeneralization_4015(
-				Classifier container, Generalization linkInstance, Classifier source, Classifier target
-				) {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistTimeObservationEvent_4018(
-				TimeObservation source, NamedElement target
-				) {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistDurationObservationEvent_4019(
-				DurationObservation source, NamedElement target
-				) {
-			return true;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistInformationItemRepresented_4020(
-				InformationItem source, Classifier target
-				) {
-			try {
-				// Represented InformationItem Target
-				if (target != null) {
-					if (!((target instanceof Class)
-							|| (target instanceof Interface)
-							|| (target instanceof InformationItem)
-							|| (target instanceof Signal) || (target instanceof Component))) {
-						return false;
-					}
-				}
-				return true;
-			} catch (Exception e) {
-				UMLDiagramEditorPlugin.getInstance().logError("Link constraint evaluation error", e); //$NON-NLS-1$
-				return false;
-			}
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean canExistInformationFlow_4021(
-				Package container, InformationFlow linkInstance, NamedElement source, NamedElement target
-				) {
-			try {
-				//Information Flow source constraint
-				if (source != null) {
-					if (!((source instanceof Actor)
-							|| (source instanceof Node)
-							|| (source instanceof UseCase)
-							|| (source instanceof Artifact)
-							|| (source instanceof Class)
-							|| (source instanceof Component)
-							|| (source instanceof Port)
-							|| (source instanceof Property)
-							|| (source instanceof Interface)
-							|| (source instanceof Package)
-							|| (source instanceof ActivityNode)
-							|| (source instanceof ActivityPartition) || (source instanceof InstanceSpecification))) {
-						return false;
-					}
-					if (source instanceof InstanceSpecification) {
-						EList<Classifier> classes = ((InstanceSpecification) source).getClassifiers();
-						for (int i = 0; i < classes.size(); i++) {
-							if (classes.get(i) instanceof Relationship) {
-								return false;
-							}
-						}
-					}
-				}
-				//Information Flow target constraint
-				if (target != null) {
-					if (!((target instanceof Actor)
-							|| (target instanceof Node)
-							|| (target instanceof UseCase)
-							|| (target instanceof Artifact)
-							|| (target instanceof Class)
-							|| (target instanceof Component)
-							|| (target instanceof Port)
-							|| (target instanceof Property)
-							|| (target instanceof Interface)
-							|| (target instanceof Package)
-							|| (target instanceof ActivityNode)
-							|| (target instanceof ActivityPartition) || (target instanceof InstanceSpecification))) {
-						return false;
-					}
-					if (target instanceof InstanceSpecification) {
-						EList<Classifier> classes = ((InstanceSpecification) target).getClassifiers();
-						for (int i = 0; i < classes.size(); i++) {
-							if (classes.get(i) instanceof Relationship) {
-								return false;
-							}
-						}
-					}
-				}
-				return true;
-			} catch (Exception e) {
-				UMLDiagramEditorPlugin.getInstance().logError("Link constraint evaluation error", e); //$NON-NLS-1$
-				return false;
-			}
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import java.util.Iterator;

+

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gef.requests.ReconnectRequest;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.common.core.command.ICompositeCommand;

+import org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.SemanticEditPolicy;

+import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.commands.MoveElementsCommand;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.edit.helpers.GeneratedEditHelperBase;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.uml2.uml.Abstraction;

+import org.eclipse.uml2.uml.ActivityNode;

+import org.eclipse.uml2.uml.ActivityPartition;

+import org.eclipse.uml2.uml.Actor;

+import org.eclipse.uml2.uml.Artifact;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.Classifier;

+import org.eclipse.uml2.uml.CollaborationUse;

+import org.eclipse.uml2.uml.Comment;

+import org.eclipse.uml2.uml.Component;

+import org.eclipse.uml2.uml.ComponentRealization;

+import org.eclipse.uml2.uml.ConnectableElement;

+import org.eclipse.uml2.uml.Connector;

+import org.eclipse.uml2.uml.ConnectorEnd;

+import org.eclipse.uml2.uml.Constraint;

+import org.eclipse.uml2.uml.Dependency;

+import org.eclipse.uml2.uml.Deployment;

+import org.eclipse.uml2.uml.DurationObservation;

+import org.eclipse.uml2.uml.Element;

+import org.eclipse.uml2.uml.Generalization;

+import org.eclipse.uml2.uml.InformationFlow;

+import org.eclipse.uml2.uml.InformationItem;

+import org.eclipse.uml2.uml.InstanceSpecification;

+import org.eclipse.uml2.uml.Interface;

+import org.eclipse.uml2.uml.InterfaceRealization;

+import org.eclipse.uml2.uml.Manifestation;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Node;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.Port;

+import org.eclipse.uml2.uml.Property;

+import org.eclipse.uml2.uml.Realization;

+import org.eclipse.uml2.uml.Relationship;

+import org.eclipse.uml2.uml.Signal;

+import org.eclipse.uml2.uml.StructuredClassifier;

+import org.eclipse.uml2.uml.Substitution;

+import org.eclipse.uml2.uml.TimeObservation;

+import org.eclipse.uml2.uml.Usage;

+import org.eclipse.uml2.uml.UseCase;

+

+/**

+ * @generated

+ */

+public class UMLBaseItemSemanticEditPolicy extends SemanticEditPolicy {

+

+	/**

+	 * Extended request data key to hold editpart visual id.

+	 * 

+	 * @generated

+	 */

+	public static final String VISUAL_ID_KEY = "visual_id"; //$NON-NLS-1$

+

+	/**

+	 * Extended request data key to hold the edge view during a reconnect request.

+	 * 

+	 * @generated

+	 */

+	public static final String GRAPHICAL_RECONNECTED_EDGE = "graphical_edge"; //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final IElementType myElementType;

+

+	/**

+	 * @generated

+	 */

+	protected UMLBaseItemSemanticEditPolicy(IElementType elementType) {

+		myElementType = elementType;

+	}

+

+	/**

+	 * Extended request data key to hold editpart visual id.

+	 * Add visual id of edited editpart to extended data of the request

+	 * so command switch can decide what kind of diagram element is being edited.

+	 * It is done in those cases when it's not possible to deduce diagram

+	 * element kind from domain element.

+	 * Add the reoriented view to the request extended data so that the view

+	 * currently edited can be distinguished from other views of the same element

+	 * and these latter possibly removed if they become inconsistent after reconnect

+	 * 

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	public Command getCommand(Request request) {

+		if(request instanceof ReconnectRequest) {

+			Object view = ((ReconnectRequest)request).getConnectionEditPart().getModel();

+			if(view instanceof View) {

+				Integer id = new Integer(UMLVisualIDRegistry.getVisualID((View)view));

+				request.getExtendedData().put(VISUAL_ID_KEY, id);

+				request.getExtendedData().put(GRAPHICAL_RECONNECTED_EDGE, (View)view);

+			}

+		}

+		return super.getCommand(request);

+	}

+

+	/**

+	 * Returns visual id from request parameters.

+	 * 

+	 * @generated

+	 */

+	protected int getVisualID(IEditCommandRequest request) {

+		Object id = request.getParameter(VISUAL_ID_KEY);

+		return id instanceof Integer ? ((Integer)id).intValue() : -1;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getSemanticCommand(IEditCommandRequest request) {

+		IEditCommandRequest completedRequest = completeRequest(request);

+		Command semanticCommand = getSemanticCommandSwitch(completedRequest);

+		semanticCommand = getEditHelperCommand(completedRequest, semanticCommand);

+		if(completedRequest instanceof DestroyRequest) {

+			DestroyRequest destroyRequest = (DestroyRequest)completedRequest;

+			return shouldProceed(destroyRequest) ? addDeleteViewCommand(semanticCommand, destroyRequest) : null;

+		}

+		return semanticCommand;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command addDeleteViewCommand(Command mainCommand, DestroyRequest completedRequest) {

+		Command deleteViewCommand = getGEFWrapper(new DeleteCommand(getEditingDomain(), (View)getHost().getModel()));

+		return mainCommand == null ? deleteViewCommand : mainCommand.chain(deleteViewCommand);

+	}

+

+	/**

+	 * @generated

+	 */

+	private Command getEditHelperCommand(IEditCommandRequest request, Command editPolicyCommand) {

+		if(editPolicyCommand != null) {

+			ICommand command = editPolicyCommand instanceof ICommandProxy ? ((ICommandProxy)editPolicyCommand).getICommand() : new CommandProxy(editPolicyCommand);

+			request.setParameter(GeneratedEditHelperBase.EDIT_POLICY_COMMAND, command);

+		}

+		IElementType requestContextElementType = getContextElementType(request);

+		request.setParameter(GeneratedEditHelperBase.CONTEXT_ELEMENT_TYPE, requestContextElementType);

+		ICommand command = requestContextElementType.getEditCommand(request);

+		request.setParameter(GeneratedEditHelperBase.EDIT_POLICY_COMMAND, null);

+		request.setParameter(GeneratedEditHelperBase.CONTEXT_ELEMENT_TYPE, null);

+		if(command != null) {

+			if(!(command instanceof CompositeTransactionalCommand)) {

+				command = new CompositeTransactionalCommand(getEditingDomain(), command.getLabel()).compose(command);

+			}

+			return new ICommandProxy(command);

+		}

+		return editPolicyCommand;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IElementType getContextElementType(IEditCommandRequest request) {

+		IElementType requestContextElementType = UMLElementTypes.getElementType(getVisualID(request));

+		return requestContextElementType != null ? requestContextElementType : myElementType;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getSemanticCommandSwitch(IEditCommandRequest req) {

+		if(req instanceof CreateRelationshipRequest) {

+			return getCreateRelationshipCommand((CreateRelationshipRequest)req);

+		} else if(req instanceof CreateElementRequest) {

+			return getCreateCommand((CreateElementRequest)req);

+		} else if(req instanceof ConfigureRequest) {

+			return getConfigureCommand((ConfigureRequest)req);

+		} else if(req instanceof DestroyElementRequest) {

+			return getDestroyElementCommand((DestroyElementRequest)req);

+		} else if(req instanceof DestroyReferenceRequest) {

+			return getDestroyReferenceCommand((DestroyReferenceRequest)req);

+		} else if(req instanceof DuplicateElementsRequest) {

+			return getDuplicateCommand((DuplicateElementsRequest)req);

+		} else if(req instanceof GetEditContextRequest) {

+			return getEditContextCommand((GetEditContextRequest)req);

+		} else if(req instanceof MoveRequest) {

+			return getMoveCommand((MoveRequest)req);

+		} else if(req instanceof ReorientReferenceRelationshipRequest) {

+			return getReorientReferenceRelationshipCommand((ReorientReferenceRelationshipRequest)req);

+		} else if(req instanceof ReorientRelationshipRequest) {

+			return getReorientRelationshipCommand((ReorientRelationshipRequest)req);

+		} else if(req instanceof SetRequest) {

+			return getSetCommand((SetRequest)req);

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getConfigureCommand(ConfigureRequest req) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateCommand(CreateElementRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			// try to get a semantic create command from the extended type

+			IElementEditService commandProvider = ElementEditServiceUtils.getCommandProvider(req.getContainer());

+			if(commandProvider != null) {

+				ICommand command = commandProvider.getEditCommand(req);

+				if(command != null && command.canExecute()) {

+					return new ICommandProxy(command);

+				}

+			}

+		}

+		return null;

+	}

+

+	// RS: add code for extended types

+	/**

+	 * @generated

+	 */

+	protected Command getExtendedTypeCreationCommand(CreateElementRequest request, IExtendedHintedElementType requestElementType) {

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(request.getContainer());

+		if(provider == null) {

+			return UnexecutableCommand.INSTANCE;

+		}

+		// Retrieve create command from the Element Edit service

+		ICommand createGMFCommand = provider.getEditCommand(request);

+		return getGEFWrapper(createGMFCommand);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getExtendedStartCreateRelationshipCommand(CreateElementRequest request, IExtendedHintedElementType requestElementType) {

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);

+		if(provider == null) {

+			return UnexecutableCommand.INSTANCE;

+		}

+		// Retrieve create command from the Element Edit service

+		ICommand createGMFCommand = provider.getEditCommand(request);

+		return getGEFWrapper(createGMFCommand);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getExtendedCompleteCreateRelationshipCommand(CreateElementRequest request, IExtendedHintedElementType requestElementType) {

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(requestElementType);

+		if(provider == null) {

+			return UnexecutableCommand.INSTANCE;

+		}

+		// Retrieve create command from the Element Edit service

+		ICommand createGMFCommand = provider.getEditCommand(request);

+		return getGEFWrapper(createGMFCommand);

+	}

+

+	// RS: End of add code for extended types

+	/**

+	 * @generated

+	 */

+	protected Command getSetCommand(SetRequest req) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getEditContextCommand(GetEditContextRequest req) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyReferenceCommand(DestroyReferenceRequest req) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDuplicateCommand(DuplicateElementsRequest req) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getMoveCommand(MoveRequest req) {

+		EObject targetCEObject = req.getTargetContainer();

+		if(targetCEObject != null) {

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(targetCEObject);

+			if(provider != null) {

+				ICommand moveCommand = provider.getEditCommand(req);

+				if(moveCommand != null) {

+					return new ICommandProxy(moveCommand);

+				}

+			}

+			return UnexecutableCommand.INSTANCE;

+		} else {

+			return getGEFWrapper(new MoveElementsCommand(req));

+		}

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected final Command getGEFWrapper(ICommand cmd) {

+		return new ICommandProxy(cmd);

+	}

+

+	/**

+	 * Returns editing domain from the host edit part.

+	 * 

+	 * @generated

+	 */

+	protected TransactionalEditingDomain getEditingDomain() {

+		return ((IGraphicalEditPart)getHost()).getEditingDomain();

+	}

+

+	/**

+	 * Clean all shortcuts to the host element from the same diagram

+	 * 

+	 * @generated

+	 */

+	protected void addDestroyShortcutsCommand(ICompositeCommand cmd, View view) {

+		assert view.getEAnnotation("Shortcut") == null; //$NON-NLS-1$

+		for(Iterator<?> it = view.getDiagram().getChildren().iterator(); it.hasNext();) {

+			View nextView = (View)it.next();

+			if(nextView.getEAnnotation("Shortcut") == null || !nextView.isSetElement() || nextView.getElement() != view.getElement()) { //$NON-NLS-1$

+				continue;

+			}

+			cmd.add(new DeleteCommand(getEditingDomain(), nextView));

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public static LinkConstraints getLinkConstraints() {

+		LinkConstraints cached = UMLDiagramEditorPlugin.getInstance().getLinkConstraints();

+		if(cached == null) {

+			UMLDiagramEditorPlugin.getInstance().setLinkConstraints(cached = new LinkConstraints());

+		}

+		return cached;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static class LinkConstraints {

+

+		/**

+		 * @generated

+		 */

+		public LinkConstraints() { // use static method #getLinkConstraints() to access instance

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateLink_4022() {

+			return canExistLink_4022();

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateLink_4001() {

+			return canExistLink_4001();

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateCommentAnnotatedElement_4002(Comment source, Element target) {

+			if(source != null) {

+				if(source.getAnnotatedElements().contains(target)) {

+					return false;

+				}

+			}

+

+			return canExistCommentAnnotatedElement_4002(source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateConstraintConstrainedElement_4003(Constraint source, Element target) {

+			if(source != null) {

+				if(source.getConstrainedElements().contains(target)) {

+					return false;

+				}

+			}

+

+			return canExistConstraintConstrainedElement_4003(source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateComponentRealization_4004(Package container, NamedElement source, NamedElement target) {

+			return canExistComponentRealization_4004(container, null, source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateInterfaceRealization_4005(Package container, NamedElement source, NamedElement target) {

+			return canExistInterfaceRealization_4005(container, null, source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateSubstitution_4011(Package container, NamedElement source, NamedElement target) {

+			return canExistSubstitution_4011(container, null, source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateRealization_4006(Package container, NamedElement source, NamedElement target) {

+			return canExistRealization_4006(container, null, source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateManifestation_4012(Package container, NamedElement source, NamedElement target) {

+			return canExistManifestation_4012(container, null, source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateAbstraction_4007(Package container, NamedElement source, NamedElement target) {

+			return canExistAbstraction_4007(container, null, source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateUsage_4008(Package container, NamedElement source, NamedElement target) {

+			return canExistUsage_4008(container, null, source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateDeployment_4009(Package container, NamedElement source, NamedElement target) {

+			return canExistDeployment_4009(container, null, source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateDependency_4017(Package container, NamedElement source, NamedElement target) {

+			return canExistDependency_4017(container, null, source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateDependency_4010(Package container, NamedElement source, NamedElement target) {

+			return canExistDependency_4010(container, null, source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateConnector_4013(StructuredClassifier container, ConnectorEnd source, ConnectorEnd target) {

+			return canExistConnector_4013(container, null, source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateGeneralization_4015(Classifier container, Classifier source, Classifier target) {

+			return canExistGeneralization_4015(container, null, source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateTimeObservationEvent_4018(TimeObservation source, NamedElement target) {

+			if(source != null) {

+				if(source.getEvent() != null) {

+					return false;

+				}

+			}

+

+			return canExistTimeObservationEvent_4018(source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateDurationObservationEvent_4019(DurationObservation source, NamedElement target) {

+			if(source != null) {

+				if(source.getEvents().size() >= 2 || source.getEvents().contains(target)) {

+					return false;

+				}

+			}

+

+			return canExistDurationObservationEvent_4019(source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateInformationItemRepresented_4020(InformationItem source, Classifier target) {

+			if(source != null) {

+				if(source.getRepresenteds().contains(target)) {

+					return false;

+				}

+			}

+

+			return canExistInformationItemRepresented_4020(source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canCreateInformationFlow_4021(Package container, NamedElement source, NamedElement target) {

+			return canExistInformationFlow_4021(container, null, source, target);

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistLink_4022() {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistLink_4001() {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistCommentAnnotatedElement_4002(Comment source, Element target) {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistConstraintConstrainedElement_4003(Constraint source, Element target) {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistComponentRealization_4004(Package container, ComponentRealization linkInstance, NamedElement source, NamedElement target) {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistInterfaceRealization_4005(Package container, InterfaceRealization linkInstance, NamedElement source, NamedElement target) {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistSubstitution_4011(Package container, Substitution linkInstance, NamedElement source, NamedElement target) {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistRealization_4006(Package container, Realization linkInstance, NamedElement source, NamedElement target) {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistManifestation_4012(Package container, Manifestation linkInstance, NamedElement source, NamedElement target) {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistAbstraction_4007(Package container, Abstraction linkInstance, NamedElement source, NamedElement target) {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistUsage_4008(Package container, Usage linkInstance, NamedElement source, NamedElement target) {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistDeployment_4009(Package container, Deployment linkInstance, NamedElement source, NamedElement target) {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistDependency_4017(Package container, Dependency linkInstance, NamedElement source, NamedElement target) {

+			try {

+				// RoleBinding source constraint

+				if((source != null) && !(source instanceof CollaborationUse)) {

+					return false;

+				}

+				// RoleBinding source has a type

+				if((source != null) && (((CollaborationUse)source).getType() == null)) {

+					return false;

+				}

+				// RoleBinding target constraint

+				if((target != null) && !(target instanceof ConnectableElement)) {

+					return false;

+				}

+				// RoleBinding source and target have the same semantic parent

+				if((source != null) && (target != null) && (source.getOwner() != target.getOwner())) {

+					return false;

+				}

+				return true;

+			} catch (Exception e) {

+				UMLDiagramEditorPlugin.getInstance().logError("Link constraint evaluation error", e); //$NON-NLS-1$

+				return false;

+			}

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistDependency_4010(Package container, Dependency linkInstance, NamedElement source, NamedElement target) {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistConnector_4013(StructuredClassifier container, Connector linkInstance, ConnectorEnd source, ConnectorEnd target) {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistGeneralization_4015(Classifier container, Generalization linkInstance, Classifier source, Classifier target) {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistTimeObservationEvent_4018(TimeObservation source, NamedElement target) {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistDurationObservationEvent_4019(DurationObservation source, NamedElement target) {

+			return true;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistInformationItemRepresented_4020(InformationItem source, Classifier target) {

+			try {

+				// Represented InformationItem Target

+				if(target != null) {

+					if(!((target instanceof Class) || (target instanceof Interface) || (target instanceof InformationItem) || (target instanceof Signal) || (target instanceof Component))) {

+						return false;

+					}

+				}

+				return true;

+			} catch (Exception e) {

+				UMLDiagramEditorPlugin.getInstance().logError("Link constraint evaluation error", e); //$NON-NLS-1$

+				return false;

+			}

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean canExistInformationFlow_4021(Package container, InformationFlow linkInstance, NamedElement source, NamedElement target) {

+			try {

+				//Information Flow source constraint

+				if(source != null) {

+					if(!((source instanceof Actor) || (source instanceof Node) || (source instanceof UseCase) || (source instanceof Artifact) || (source instanceof Class) || (source instanceof Component) || (source instanceof Port) || (source instanceof Property) || (source instanceof Interface) || (source instanceof Package) || (source instanceof ActivityNode) || (source instanceof ActivityPartition) || (source instanceof InstanceSpecification))) {

+

+						return false;

+

+					}

+					if(source instanceof InstanceSpecification) {

+						EList<Classifier> classes = ((InstanceSpecification)source).getClassifiers();

+						for(int i = 0; i < classes.size(); i++) {

+							if(classes.get(i) instanceof Relationship) {

+								return false;

+							}

+						}

+					}

+				}

+				//Information Flow target constraint

+				if(target != null) {

+					if(!((target instanceof Actor) || (target instanceof Node) || (target instanceof UseCase) || (target instanceof Artifact) || (target instanceof Class) || (target instanceof Component) || (target instanceof Port) || (target instanceof Property) || (target instanceof Interface) || (target instanceof Package) || (target instanceof ActivityNode) || (target instanceof ActivityPartition) || (target instanceof InstanceSpecification))) {

+

+						return false;

+

+					}

+					if(target instanceof InstanceSpecification) {

+						EList<Classifier> classes = ((InstanceSpecification)target).getClassifiers();

+						for(int i = 0; i < classes.size(); i++) {

+							if(classes.get(i) instanceof Relationship) {

+								return false;

+							}

+						}

+					}

+				}

+				return true;

+			} catch (Exception e) {

+				UMLDiagramEditorPlugin.getInstance().logError("Link constraint evaluation error", e); //$NON-NLS-1$

+				return false;

+			}

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLTextNonResizableEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLTextNonResizableEditPolicy.java
index 05fa5ffe8cc..7726b63f2c0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLTextNonResizableEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLTextNonResizableEditPolicy.java
@@ -1,231 +1,235 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FigureListener;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.handles.MoveHandle;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.NonResizableEditPolicyEx;
-import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.tooling.runtime.edit.policies.labels.IRefreshableFeedbackEditPolicy;
-
-/**
- * @generated
- */
-public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx implements IRefreshableFeedbackEditPolicy {
-	/**
-	 * @generated
-	 */
-	private IFigure selectionFeedbackFigure;
-	/**
-	 * @generated
-	 */
-	private IFigure focusFeedbackFigure;
-	/**
-	 * @generated
-	 */
-	private FigureListener hostPositionListener;
-
-	/**
-	 * @generated
-	 */
-	protected void showPrimarySelection() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setSelected(true);
-			((WrappingLabel) getHostFigure()).setFocus(true);
-		} else {
-			showSelection();
-			showFocus();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void showSelection() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setSelected(true);
-			((WrappingLabel) getHostFigure()).setFocus(false);
-		} else {
-			hideSelection();
-			addFeedback(selectionFeedbackFigure = createSelectionFeedbackFigure());
-			getHostFigure().addFigureListener(getHostPositionListener());
-			refreshSelectionFeedback();
-			hideFocus();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void hideSelection() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setSelected(false);
-			((WrappingLabel) getHostFigure()).setFocus(false);
-		} else {
-			if (selectionFeedbackFigure != null) {
-				removeFeedback(selectionFeedbackFigure);
-				getHostFigure().removeFigureListener(getHostPositionListener());
-				selectionFeedbackFigure = null;
-			}
-			hideFocus();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void showFocus() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setFocus(true);
-		} else {
-			hideFocus();
-			addFeedback(focusFeedbackFigure = createFocusFeedbackFigure());
-			refreshFocusFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void hideFocus() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setFocus(false);
-		} else {
-			if (focusFeedbackFigure != null) {
-				removeFeedback(focusFeedbackFigure);
-				focusFeedbackFigure = null;
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Rectangle getFeedbackBounds() {
-		Rectangle bounds;
-		if (getHostFigure() instanceof Label) {
-			bounds = ((Label) getHostFigure()).getTextBounds();
-			bounds.intersect(getHostFigure().getBounds());
-		} else {
-			bounds = getHostFigure().getBounds().getCopy();
-		}
-		getHostFigure().getParent().translateToAbsolute(bounds);
-		getFeedbackLayer().translateToRelative(bounds);
-		return bounds;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createSelectionFeedbackFigure() {
-		if (getHostFigure() instanceof Label) {
-			Label feedbackFigure = new Label();
-			feedbackFigure.setOpaque(true);
-			feedbackFigure.setBackgroundColor(ColorConstants.menuBackgroundSelected);
-			feedbackFigure.setForegroundColor(ColorConstants.menuForegroundSelected);
-			return feedbackFigure;
-		} else {
-			RectangleFigure feedbackFigure = new RectangleFigure();
-			feedbackFigure.setFill(false);
-			return feedbackFigure;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFocusFeedbackFigure() {
-		return new Figure() {
-			protected void paintFigure(Graphics graphics) {
-				graphics.drawFocus(getBounds().getResized(-1, -1));
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void updateLabel(Label target) {
-		Label source = (Label) getHostFigure();
-		target.setText(source.getText());
-		target.setTextAlignment(source.getTextAlignment());
-		target.setFont(source.getFont());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshSelectionFeedback() {
-		if (selectionFeedbackFigure != null) {
-			if (selectionFeedbackFigure instanceof Label) {
-				updateLabel((Label) selectionFeedbackFigure);
-				selectionFeedbackFigure.setBounds(getFeedbackBounds());
-			} else {
-				selectionFeedbackFigure.setBounds(getFeedbackBounds().expand(5, 5));
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFocusFeedback() {
-		if (focusFeedbackFigure != null) {
-			focusFeedbackFigure.setBounds(getFeedbackBounds());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void refreshFeedback() {
-		refreshSelectionFeedback();
-		refreshFocusFeedback();
-	}
-
-	/**
-	 * @generated
-	 */
-	private FigureListener getHostPositionListener() {
-		if (hostPositionListener == null) {
-			hostPositionListener = new FigureListener() {
-				public void figureMoved(IFigure source) {
-					refreshFeedback();
-				}
-			};
-		}
-		return hostPositionListener;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected List<?> createSelectionHandles() {
-		MoveHandle moveHandle =
-				new MoveHandle((GraphicalEditPart) getHost());
-		moveHandle.setBorder(null);
-		moveHandle.setDragTracker(new DragEditPartsTrackerEx(getHost()));
-		return Collections.singletonList(moveHandle);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import java.util.Collections;

+import java.util.List;

+

+import org.eclipse.draw2d.ColorConstants;

+import org.eclipse.draw2d.Figure;

+import org.eclipse.draw2d.FigureListener;

+import org.eclipse.draw2d.Graphics;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.gef.GraphicalEditPart;

+import org.eclipse.gef.handles.MoveHandle;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.NonResizableEditPolicyEx;

+import org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.tooling.runtime.edit.policies.labels.IRefreshableFeedbackEditPolicy;

+

+/**

+ * @generated

+ */

+public class UMLTextNonResizableEditPolicy extends NonResizableEditPolicyEx implements IRefreshableFeedbackEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private IFigure selectionFeedbackFigure;

+

+	/**

+	 * @generated

+	 */

+	private IFigure focusFeedbackFigure;

+

+	/**

+	 * @generated

+	 */

+	private FigureListener hostPositionListener;

+

+	/**

+	 * @generated

+	 */

+	protected void showPrimarySelection() {

+		if(getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getHostFigure()).setSelected(true);

+			((WrappingLabel)getHostFigure()).setFocus(true);

+		} else {

+			showSelection();

+			showFocus();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void showSelection() {

+		if(getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getHostFigure()).setSelected(true);

+			((WrappingLabel)getHostFigure()).setFocus(false);

+		} else {

+			hideSelection();

+			addFeedback(selectionFeedbackFigure = createSelectionFeedbackFigure());

+			getHostFigure().addFigureListener(getHostPositionListener());

+			refreshSelectionFeedback();

+			hideFocus();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void hideSelection() {

+		if(getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getHostFigure()).setSelected(false);

+			((WrappingLabel)getHostFigure()).setFocus(false);

+		} else {

+			if(selectionFeedbackFigure != null) {

+				removeFeedback(selectionFeedbackFigure);

+				getHostFigure().removeFigureListener(getHostPositionListener());

+				selectionFeedbackFigure = null;

+			}

+			hideFocus();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void showFocus() {

+		if(getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getHostFigure()).setFocus(true);

+		} else {

+			hideFocus();

+			addFeedback(focusFeedbackFigure = createFocusFeedbackFigure());

+			refreshFocusFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void hideFocus() {

+		if(getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getHostFigure()).setFocus(false);

+		} else {

+			if(focusFeedbackFigure != null) {

+				removeFeedback(focusFeedbackFigure);

+				focusFeedbackFigure = null;

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Rectangle getFeedbackBounds() {

+		Rectangle bounds;

+		if(getHostFigure() instanceof Label) {

+			bounds = ((Label)getHostFigure()).getTextBounds();

+			bounds.intersect(getHostFigure().getBounds());

+		} else {

+			bounds = getHostFigure().getBounds().getCopy();

+		}

+		getHostFigure().getParent().translateToAbsolute(bounds);

+		getFeedbackLayer().translateToRelative(bounds);

+		return bounds;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createSelectionFeedbackFigure() {

+		if(getHostFigure() instanceof Label) {

+			Label feedbackFigure = new Label();

+			feedbackFigure.setOpaque(true);

+			feedbackFigure.setBackgroundColor(ColorConstants.menuBackgroundSelected);

+			feedbackFigure.setForegroundColor(ColorConstants.menuForegroundSelected);

+			return feedbackFigure;

+		} else {

+			RectangleFigure feedbackFigure = new RectangleFigure();

+			feedbackFigure.setFill(false);

+			return feedbackFigure;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFocusFeedbackFigure() {

+		return new Figure() {

+

+			protected void paintFigure(Graphics graphics) {

+				graphics.drawFocus(getBounds().getResized(-1, -1));

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void updateLabel(Label target) {

+		Label source = (Label)getHostFigure();

+		target.setText(source.getText());

+		target.setTextAlignment(source.getTextAlignment());

+		target.setFont(source.getFont());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSelectionFeedback() {

+		if(selectionFeedbackFigure != null) {

+			if(selectionFeedbackFigure instanceof Label) {

+				updateLabel((Label)selectionFeedbackFigure);

+				selectionFeedbackFigure.setBounds(getFeedbackBounds());

+			} else {

+				selectionFeedbackFigure.setBounds(getFeedbackBounds().expand(5, 5));

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFocusFeedback() {

+		if(focusFeedbackFigure != null) {

+			focusFeedbackFigure.setBounds(getFeedbackBounds());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshFeedback() {

+		refreshSelectionFeedback();

+		refreshFocusFeedback();

+	}

+

+	/**

+	 * @generated

+	 */

+	private FigureListener getHostPositionListener() {

+		if(hostPositionListener == null) {

+			hostPositionListener = new FigureListener() {

+

+				public void figureMoved(IFigure source) {

+					refreshFeedback();

+				}

+			};

+		}

+		return hostPositionListener;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected List<?> createSelectionHandles() {

+		MoveHandle moveHandle = new MoveHandle((GraphicalEditPart)getHost());

+		moveHandle.setBorder(null);

+		moveHandle.setDragTracker(new DragEditPartsTrackerEx(getHost()));

+		return Collections.singletonList(moveHandle);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLTextSelectionEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLTextSelectionEditPolicy.java
index 2a657c6361a..47efd8feee2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLTextSelectionEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UMLTextSelectionEditPolicy.java
@@ -1,214 +1,219 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FigureListener;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.editpolicies.SelectionEditPolicy;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;
-import org.eclipse.gmf.tooling.runtime.edit.policies.labels.IRefreshableFeedbackEditPolicy;
-
-/**
- * @generated
- */
-public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements IRefreshableFeedbackEditPolicy {
-	/**
-	 * @generated
-	 */
-	private IFigure selectionFeedbackFigure;
-	/**
-	 * @generated
-	 */
-	private IFigure focusFeedbackFigure;
-	/**
-	 * @generated
-	 */
-	private FigureListener hostPositionListener;
-
-	/**
-	 * @generated
-	 */
-	protected void showPrimarySelection() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setSelected(true);
-			((WrappingLabel) getHostFigure()).setFocus(true);
-		} else {
-			showSelection();
-			showFocus();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void showSelection() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setSelected(true);
-			((WrappingLabel) getHostFigure()).setFocus(false);
-		} else {
-			hideSelection();
-			addFeedback(selectionFeedbackFigure = createSelectionFeedbackFigure());
-			getHostFigure().addFigureListener(getHostPositionListener());
-			refreshSelectionFeedback();
-			hideFocus();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void hideSelection() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setSelected(false);
-			((WrappingLabel) getHostFigure()).setFocus(false);
-		} else {
-			if (selectionFeedbackFigure != null) {
-				removeFeedback(selectionFeedbackFigure);
-				getHostFigure().removeFigureListener(getHostPositionListener());
-				selectionFeedbackFigure = null;
-			}
-			hideFocus();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void showFocus() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setFocus(true);
-		} else {
-			hideFocus();
-			addFeedback(focusFeedbackFigure = createFocusFeedbackFigure());
-			refreshFocusFeedback();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void hideFocus() {
-		if (getHostFigure() instanceof WrappingLabel) {
-			((WrappingLabel) getHostFigure()).setFocus(false);
-		} else {
-			if (focusFeedbackFigure != null) {
-				removeFeedback(focusFeedbackFigure);
-				focusFeedbackFigure = null;
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Rectangle getFeedbackBounds() {
-		Rectangle bounds;
-		if (getHostFigure() instanceof Label) {
-			bounds = ((Label) getHostFigure()).getTextBounds();
-			bounds.intersect(getHostFigure().getBounds());
-		} else {
-			bounds = getHostFigure().getBounds().getCopy();
-		}
-		getHostFigure().getParent().translateToAbsolute(bounds);
-		getFeedbackLayer().translateToRelative(bounds);
-		return bounds;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createSelectionFeedbackFigure() {
-		if (getHostFigure() instanceof Label) {
-			Label feedbackFigure = new Label();
-			feedbackFigure.setOpaque(true);
-			feedbackFigure.setBackgroundColor(ColorConstants.menuBackgroundSelected);
-			feedbackFigure.setForegroundColor(ColorConstants.menuForegroundSelected);
-			return feedbackFigure;
-		} else {
-			RectangleFigure feedbackFigure = new RectangleFigure();
-			feedbackFigure.setFill(false);
-			return feedbackFigure;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IFigure createFocusFeedbackFigure() {
-		return new Figure() {
-			protected void paintFigure(Graphics graphics) {
-				graphics.drawFocus(getBounds().getResized(-1, -1));
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void updateLabel(Label target) {
-		Label source = (Label) getHostFigure();
-		target.setText(source.getText());
-		target.setTextAlignment(source.getTextAlignment());
-		target.setFont(source.getFont());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshSelectionFeedback() {
-		if (selectionFeedbackFigure != null) {
-			if (selectionFeedbackFigure instanceof Label) {
-				updateLabel((Label) selectionFeedbackFigure);
-				selectionFeedbackFigure.setBounds(getFeedbackBounds());
-			} else {
-				selectionFeedbackFigure.setBounds(getFeedbackBounds().expand(5, 5));
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void refreshFocusFeedback() {
-		if (focusFeedbackFigure != null) {
-			focusFeedbackFigure.setBounds(getFeedbackBounds());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void refreshFeedback() {
-		refreshSelectionFeedback();
-		refreshFocusFeedback();
-	}
-
-	/**
-	 * @generated
-	 */
-	private FigureListener getHostPositionListener() {
-		if (hostPositionListener == null) {
-			hostPositionListener = new FigureListener() {
-				public void figureMoved(IFigure source) {
-					refreshFeedback();
-				}
-			};
-		}
-		return hostPositionListener;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.draw2d.ColorConstants;

+import org.eclipse.draw2d.Figure;

+import org.eclipse.draw2d.FigureListener;

+import org.eclipse.draw2d.Graphics;

+import org.eclipse.draw2d.IFigure;

+import org.eclipse.draw2d.Label;

+import org.eclipse.draw2d.RectangleFigure;

+import org.eclipse.draw2d.geometry.Rectangle;

+import org.eclipse.gef.editpolicies.SelectionEditPolicy;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

+import org.eclipse.gmf.tooling.runtime.edit.policies.labels.IRefreshableFeedbackEditPolicy;

+

+/**

+ * @generated

+ */

+public class UMLTextSelectionEditPolicy extends SelectionEditPolicy implements IRefreshableFeedbackEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	private IFigure selectionFeedbackFigure;

+

+	/**

+	 * @generated

+	 */

+	private IFigure focusFeedbackFigure;

+

+	/**

+	 * @generated

+	 */

+	private FigureListener hostPositionListener;

+

+	/**

+	 * @generated

+	 */

+	protected void showPrimarySelection() {

+		if(getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getHostFigure()).setSelected(true);

+			((WrappingLabel)getHostFigure()).setFocus(true);

+		} else {

+			showSelection();

+			showFocus();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void showSelection() {

+		if(getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getHostFigure()).setSelected(true);

+			((WrappingLabel)getHostFigure()).setFocus(false);

+		} else {

+			hideSelection();

+			addFeedback(selectionFeedbackFigure = createSelectionFeedbackFigure());

+			getHostFigure().addFigureListener(getHostPositionListener());

+			refreshSelectionFeedback();

+			hideFocus();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void hideSelection() {

+		if(getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getHostFigure()).setSelected(false);

+			((WrappingLabel)getHostFigure()).setFocus(false);

+		} else {

+			if(selectionFeedbackFigure != null) {

+				removeFeedback(selectionFeedbackFigure);

+				getHostFigure().removeFigureListener(getHostPositionListener());

+				selectionFeedbackFigure = null;

+			}

+			hideFocus();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void showFocus() {

+		if(getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getHostFigure()).setFocus(true);

+		} else {

+			hideFocus();

+			addFeedback(focusFeedbackFigure = createFocusFeedbackFigure());

+			refreshFocusFeedback();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void hideFocus() {

+		if(getHostFigure() instanceof WrappingLabel) {

+			((WrappingLabel)getHostFigure()).setFocus(false);

+		} else {

+			if(focusFeedbackFigure != null) {

+				removeFeedback(focusFeedbackFigure);

+				focusFeedbackFigure = null;

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Rectangle getFeedbackBounds() {

+		Rectangle bounds;

+		if(getHostFigure() instanceof Label) {

+			bounds = ((Label)getHostFigure()).getTextBounds();

+			bounds.intersect(getHostFigure().getBounds());

+		} else {

+			bounds = getHostFigure().getBounds().getCopy();

+		}

+		getHostFigure().getParent().translateToAbsolute(bounds);

+		getFeedbackLayer().translateToRelative(bounds);

+		return bounds;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createSelectionFeedbackFigure() {

+		if(getHostFigure() instanceof Label) {

+			Label feedbackFigure = new Label();

+			feedbackFigure.setOpaque(true);

+			feedbackFigure.setBackgroundColor(ColorConstants.menuBackgroundSelected);

+			feedbackFigure.setForegroundColor(ColorConstants.menuForegroundSelected);

+			return feedbackFigure;

+		} else {

+			RectangleFigure feedbackFigure = new RectangleFigure();

+			feedbackFigure.setFill(false);

+			return feedbackFigure;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IFigure createFocusFeedbackFigure() {

+		return new Figure() {

+

+			protected void paintFigure(Graphics graphics) {

+				graphics.drawFocus(getBounds().getResized(-1, -1));

+			}

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void updateLabel(Label target) {

+		Label source = (Label)getHostFigure();

+		target.setText(source.getText());

+		target.setTextAlignment(source.getTextAlignment());

+		target.setFont(source.getFont());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshSelectionFeedback() {

+		if(selectionFeedbackFigure != null) {

+			if(selectionFeedbackFigure instanceof Label) {

+				updateLabel((Label)selectionFeedbackFigure);

+				selectionFeedbackFigure.setBounds(getFeedbackBounds());

+			} else {

+				selectionFeedbackFigure.setBounds(getFeedbackBounds().expand(5, 5));

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void refreshFocusFeedback() {

+		if(focusFeedbackFigure != null) {

+			focusFeedbackFigure.setBounds(getFeedbackBounds());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void refreshFeedback() {

+		refreshSelectionFeedback();

+		refreshFocusFeedback();

+	}

+

+	/**

+	 * @generated

+	 */

+	private FigureListener getHostPositionListener() {

+		if(hostPositionListener == null) {

+			hostPositionListener = new FigureListener() {

+

+				public void figureMoved(IFigure source) {

+					refreshFeedback();

+				}

+			};

+		}

+		return hostPositionListener;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UsageItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UsageItemSemanticEditPolicy.java
index 1b0216caf95..ab1916da443 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UsageItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UsageItemSemanticEditPolicy.java
@@ -1,399 +1,369 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class UsageItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public UsageItemSemanticEditPolicy() {
-		super(UMLElementTypes.Usage_4008);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class UsageItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public UsageItemSemanticEditPolicy() {

+		super(UMLElementTypes.Usage_4008);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicy.java
index 287e4a07d0d..a15f17fa1b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicy.java
@@ -1,431 +1,398 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class UseCaseItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public UseCaseItemSemanticEditPolicy() {
-		super(UMLElementTypes.UseCase_2082);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class UseCaseItemSemanticEditPolicy extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public UseCaseItemSemanticEditPolicy() {

+		super(UMLElementTypes.UseCase_2082);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicyCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicyCN.java
index 96c46fc21af..4dd2c144021 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicyCN.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/policies/UseCaseItemSemanticEditPolicyCN.java
@@ -1,431 +1,398 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.edit.policies;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.UnexecutableCommand;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;
-import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class UseCaseItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {
-	/**
-	 * @generated
-	 */
-	public UseCaseItemSemanticEditPolicyCN() {
-		super(UMLElementTypes.UseCase_3096);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getDestroyElementCommand(DestroyElementRequest req) {
-		EObject selectedEObject = req.getElementToDestroy();
-		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);
-		if (provider != null) {
-			// Retrieve delete command from the Element Edit service
-			ICommand deleteCommand = provider.getEditCommand(req);
-			if (deleteCommand != null) {
-				return new ICommandProxy(deleteCommand);
-			}
-		}
-		return UnexecutableCommand.INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		Command command = req.getTarget() == null ?
-				getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-		return command != null ? command : super.getCreateRelationshipCommand(req);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getStartCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			return null;
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Command getCompleteCreateRelationshipCommand(
-			CreateRelationshipRequest req) {
-		IElementType requestElementType = req.getElementType();
-		if (requestElementType == null) {
-			return null;
-		}
-		IElementType baseElementType = requestElementType;
-		boolean isExtendedType = false;
-		if (requestElementType instanceof IExtendedHintedElementType) {
-			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);
-			if (baseElementType != null) {
-				isExtendedType = true;
-			} else {
-				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.
-				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType) requestElementType);
-				isExtendedType = true;
-			}
-		}
-		if (UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.ComponentRealization_4004 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ComponentRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InterfaceRealization_4005 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InterfaceRealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Substitution_4011 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new SubstitutionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Realization_4006 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RealizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Manifestation_4012 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new ManifestationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Abstraction_4007 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new AbstractionCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Usage_4008 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new UsageCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Deployment_4009 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DeploymentCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4017 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RoleBindingCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Dependency_4010 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DependencyCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.Generalization_4015 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new GeneralizationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new TimeObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new DurationObservationEventCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new RepresentationCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		if (UMLElementTypes.InformationFlow_4021 == baseElementType) {
-			if (isExtendedType) {
-				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType) requestElementType);
-			}
-			return getGEFWrapper(new InformationFlowCreateCommand(req,
-					req.getSource(), req.getTarget()));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns command to reorient EClass based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientRelationshipCommand(
-			ReorientRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case ComponentRealizationEditPart.VISUAL_ID:
-		case InterfaceRealizationEditPart.VISUAL_ID:
-		case SubstitutionEditPart.VISUAL_ID:
-		case RealizationEditPart.VISUAL_ID:
-		case ManifestationEditPart.VISUAL_ID:
-		case AbstractionEditPart.VISUAL_ID:
-		case UsageEditPart.VISUAL_ID:
-		case DeploymentEditPart.VISUAL_ID:
-		case DependencyEditPart.VISUAL_ID:
-		case GeneralizationEditPart.VISUAL_ID:
-		case InformationFlowEditPart.VISUAL_ID:
-			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());
-			if (provider == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			// Retrieve re-orient command from the Element Edit service
-			ICommand reorientCommand = provider.getEditCommand(req);
-			if (reorientCommand == null) {
-				return UnexecutableCommand.INSTANCE;
-			}
-			return getGEFWrapper(reorientCommand.reduce());
-		case RoleBindingEditPart.VISUAL_ID:
-			return getGEFWrapper(new RoleBindingReorientCommand(req));
-		}
-		return super.getReorientRelationshipCommand(req);
-	}
-
-	/**
-	 * Returns command to reorient EReference based link. New link target or source
-	 * should be the domain model element associated with this node.
-	 * 
-	 * @generated
-	 */
-	protected Command getReorientReferenceRelationshipCommand(
-			ReorientReferenceRelationshipRequest req) {
-		switch (getVisualID(req)) {
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new TimeObservationEventReorientCommand(req));
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return getGEFWrapper(new DurationObservationEventReorientCommand(req));
-		case RepresentationEditPart.VISUAL_ID:
-			return getGEFWrapper(new RepresentationReorientCommand(req));
-		}
-		return super.getReorientReferenceRelationshipCommand(req);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.edit.policies;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.AbstractionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.CommentAnnotatedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ComponentRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ConstraintConstrainedElementReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DependencyCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DeploymentCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.DurationObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.GeneralizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InformationFlowCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.InterfaceRealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.ManifestationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RealizationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RepresentationReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.RoleBindingReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.SubstitutionCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.TimeObservationEventReorientCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.commands.UsageCreateCommand;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.AbstractionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CommentAnnotatedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ComponentRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ConstraintConstrainedElementEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DependencyEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DeploymentEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.DurationObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.GeneralizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InformationFlowEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.InterfaceRealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.ManifestationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RealizationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RepresentationEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.RoleBindingEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.SubstitutionEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.TimeObservationEventEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UsageEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class UseCaseItemSemanticEditPolicyCN extends UMLBaseItemSemanticEditPolicy {

+

+	/**

+	 * @generated

+	 */

+	public UseCaseItemSemanticEditPolicyCN() {

+		super(UMLElementTypes.UseCase_3096);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getDestroyElementCommand(DestroyElementRequest req) {

+		EObject selectedEObject = req.getElementToDestroy();

+		IElementEditService provider = ElementEditServiceUtils.getCommandProvider(selectedEObject);

+		if(provider != null) {

+			// Retrieve delete command from the Element Edit service

+			ICommand deleteCommand = provider.getEditCommand(req);

+

+			if(deleteCommand != null) {

+				return new ICommandProxy(deleteCommand);

+			}

+		}

+		return UnexecutableCommand.INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCreateRelationshipCommand(CreateRelationshipRequest req) {

+		Command command = req.getTarget() == null ? getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);

+		return command != null ? command : super.getCreateRelationshipCommand(req);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getStartCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			return null;

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedStartCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Command getCompleteCreateRelationshipCommand(CreateRelationshipRequest req) {

+		IElementType requestElementType = req.getElementType();

+		if(requestElementType == null) {

+			return null;

+		}

+		IElementType baseElementType = requestElementType;

+		boolean isExtendedType = false;

+		if(requestElementType instanceof IExtendedHintedElementType) {

+			baseElementType = ElementTypeUtils.getClosestDiagramType(requestElementType);

+			if(baseElementType != null) {

+				isExtendedType = true;

+			} else {

+				// no reference element type ID. using the closest super element type to give more opportunities, but can lead to bugs.

+				baseElementType = ElementTypeUtils.findClosestNonExtendedElementType((IExtendedHintedElementType)requestElementType);

+				isExtendedType = true;

+			}

+		}

+		if(UMLElementTypes.CommentAnnotatedElement_4002 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new CommentAnnotatedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ConstraintConstrainedElement_4003 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ConstraintConstrainedElementCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.ComponentRealization_4004 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ComponentRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InterfaceRealization_4005 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InterfaceRealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Substitution_4011 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new SubstitutionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Realization_4006 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RealizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Manifestation_4012 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new ManifestationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Abstraction_4007 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new AbstractionCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Usage_4008 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new UsageCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Deployment_4009 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DeploymentCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4017 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RoleBindingCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Dependency_4010 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DependencyCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.Generalization_4015 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new GeneralizationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.TimeObservationEvent_4018 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new TimeObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.DurationObservationEvent_4019 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new DurationObservationEventCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationItemRepresented_4020 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new RepresentationCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		if(UMLElementTypes.InformationFlow_4021 == baseElementType) {

+			if(isExtendedType) {

+				return getExtendedCompleteCreateRelationshipCommand(req, (IExtendedHintedElementType)requestElementType);

+			}

+			return getGEFWrapper(new InformationFlowCreateCommand(req, req.getSource(), req.getTarget()));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns command to reorient EClass based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientRelationshipCommand(ReorientRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case ComponentRealizationEditPart.VISUAL_ID:

+		case InterfaceRealizationEditPart.VISUAL_ID:

+		case SubstitutionEditPart.VISUAL_ID:

+		case RealizationEditPart.VISUAL_ID:

+		case ManifestationEditPart.VISUAL_ID:

+		case AbstractionEditPart.VISUAL_ID:

+		case UsageEditPart.VISUAL_ID:

+		case DeploymentEditPart.VISUAL_ID:

+		case DependencyEditPart.VISUAL_ID:

+		case GeneralizationEditPart.VISUAL_ID:

+		case InformationFlowEditPart.VISUAL_ID:

+			IElementEditService provider = ElementEditServiceUtils.getCommandProvider(req.getRelationship());

+			if(provider == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			// Retrieve re-orient command from the Element Edit service

+			ICommand reorientCommand = provider.getEditCommand(req);

+			if(reorientCommand == null) {

+				return UnexecutableCommand.INSTANCE;

+			}

+			return getGEFWrapper(reorientCommand.reduce());

+		case RoleBindingEditPart.VISUAL_ID:

+			return getGEFWrapper(new RoleBindingReorientCommand(req));

+		}

+		return super.getReorientRelationshipCommand(req);

+	}

+

+	/**

+	 * Returns command to reorient EReference based link. New link target or source

+	 * should be the domain model element associated with this node.

+	 * 

+	 * @generated

+	 */

+	protected Command getReorientReferenceRelationshipCommand(ReorientReferenceRelationshipRequest req) {

+		switch(getVisualID(req)) {

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new CommentAnnotatedElementReorientCommand(req));

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return getGEFWrapper(new ConstraintConstrainedElementReorientCommand(req));

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new TimeObservationEventReorientCommand(req));

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return getGEFWrapper(new DurationObservationEventReorientCommand(req));

+		case RepresentationEditPart.VISUAL_ID:

+			return getGEFWrapper(new RepresentationReorientCommand(req));

+		}

+		return super.getReorientReferenceRelationshipCommand(req);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/parsers/AbstractParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/parsers/AbstractParser.java
index f5b29e4ea0d..663b3700530 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/parsers/AbstractParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/parsers/AbstractParser.java
@@ -1 +1 @@
-//Since GMFT 3.1 we don't generate class AbstractParser into every diagram, instead extend org.eclipse.gmf.tooling.runtime.parsers.AbstractAttributeParser.
+//Since GMFT 3.1 we don't generate class AbstractParser into every diagram, instead extend org.eclipse.gmf.tooling.runtime.parsers.AbstractAttributeParser.

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/parsers/MessageFormatParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/parsers/MessageFormatParser.java
index 925209010a3..40eafa33f56 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/parsers/MessageFormatParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/parsers/MessageFormatParser.java
@@ -1,200 +1,200 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.parsers;
-
-import java.text.FieldPosition;
-import java.text.MessageFormat;
-import java.text.ParsePosition;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.command.ICommand;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;
-import org.eclipse.gmf.tooling.runtime.parsers.AbstractAttributeParser;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.papyrus.uml.diagram.composite.part.Messages;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class MessageFormatParser extends AbstractAttributeParser {
-	/**
-	 * @generated
-	 */
-	private String defaultPattern;
-	/**
-	 * @generated
-	 */
-	private String defaultEditablePattern;
-	/**
-	 * @generated
-	 */
-	private MessageFormat viewProcessor;
-	/**
-	 * @generated
-	 */
-	private MessageFormat editorProcessor;
-	/**
-	 * @generated
-	 */
-	private MessageFormat editProcessor;
-
-	/**
-	 * @generated
-	 */
-	public MessageFormatParser(EAttribute[] features) {
-		super(features);
-	}
-
-	/**
-	 * @generated
-	 */
-	public MessageFormatParser(EAttribute[] features, EAttribute[] editableFeatures) {
-		super(features, editableFeatures);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getDefaultPattern() {
-		if (defaultPattern == null) {
-			StringBuffer sb = new StringBuffer();
-			for (int i = 0; i < features.length; i++) {
-				if (i > 0) {
-					sb.append(' ');
-				}
-				sb.append('{');
-				sb.append(i);
-				sb.append('}');
-			}
-			defaultPattern = sb.toString();
-		}
-		return defaultPattern;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setViewPattern(String viewPattern) {
-		super.setViewPattern(viewPattern);
-		viewProcessor = null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setEditorPattern(String editorPattern) {
-		super.setEditorPattern(editorPattern);
-		editorProcessor = null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected MessageFormat getViewProcessor() {
-		if (viewProcessor == null) {
-			viewProcessor = new MessageFormat(getViewPattern() == null ? getDefaultPattern() : getViewPattern());
-		}
-		return viewProcessor;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected MessageFormat getEditorProcessor() {
-		if (editorProcessor == null) {
-			editorProcessor = new MessageFormat(getEditorPattern() == null ? getDefaultEditablePattern() : getEditorPattern());
-		}
-		return editorProcessor;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getDefaultEditablePattern() {
-		if (defaultEditablePattern == null) {
-			StringBuffer sb = new StringBuffer();
-			for (int i = 0; i < editableFeatures.length; i++) {
-				if (i > 0) {
-					sb.append(' ');
-				}
-				sb.append('{');
-				sb.append(i);
-				sb.append('}');
-			}
-			defaultEditablePattern = sb.toString();
-		}
-		return defaultEditablePattern;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setEditPattern(String editPattern) {
-		super.setEditPattern(editPattern);
-		editProcessor = null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected MessageFormat getEditProcessor() {
-		if (editProcessor == null) {
-			editProcessor = new MessageFormat(getEditPattern() == null ? getDefaultEditablePattern() : getEditPattern());
-		}
-		return editProcessor;
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getEditString(IAdaptable adapter, int flags) {
-		EObject element = (EObject) adapter.getAdapter(EObject.class);
-		return getEditorProcessor().format(getEditableValues(element), new StringBuffer(), new FieldPosition(0)).toString();
-	}
-
-	/**
-	 * @generated
-	 */
-	public IParserEditStatus isValidEditString(IAdaptable adapter, String editString) {
-		ParsePosition pos = new ParsePosition(0);
-		Object[] values = getEditProcessor().parse(editString, pos);
-		if (values == null) {
-			return new ParserEditStatus(
-					UMLDiagramEditorPlugin.ID,
-					IParserEditStatus.UNEDITABLE,
-					NLS.bind(
-							Messages.MessageFormatParser_InvalidInputError,
-							new Integer(pos.getErrorIndex())));
-		}
-		return validateNewValues(values);
-	}
-
-	/**
-	 * @generated
-	 */
-	public ICommand getParseCommand(IAdaptable adapter, String newString, int flags) {
-		Object[] values = getEditProcessor().parse(newString, new ParsePosition(0));
-		return getParseCommand(adapter, values, flags);
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getPrintString(IAdaptable adapter, int flags) {
-		EObject element = (EObject) adapter.getAdapter(EObject.class);
-		return getViewProcessor().format(getValues(element), new StringBuffer(), new FieldPosition(0)).toString();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.parsers;

+

+import java.text.FieldPosition;

+import java.text.MessageFormat;

+import java.text.ParsePosition;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EAttribute;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.command.ICommand;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus;

+import org.eclipse.gmf.tooling.runtime.parsers.AbstractAttributeParser;

+import org.eclipse.osgi.util.NLS;

+import org.eclipse.papyrus.uml.diagram.composite.part.Messages;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public class MessageFormatParser extends AbstractAttributeParser {

+

+	/**

+	 * @generated

+	 */

+	private String defaultPattern;

+

+	/**

+	 * @generated

+	 */

+	private String defaultEditablePattern;

+

+	/**

+	 * @generated

+	 */

+	private MessageFormat viewProcessor;

+

+	/**

+	 * @generated

+	 */

+	private MessageFormat editorProcessor;

+

+	/**

+	 * @generated

+	 */

+	private MessageFormat editProcessor;

+

+	/**

+	 * @generated

+	 */

+	public MessageFormatParser(EAttribute[] features) {

+		super(features);

+	}

+

+	/**

+	 * @generated

+	 */

+	public MessageFormatParser(EAttribute[] features, EAttribute[] editableFeatures) {

+		super(features, editableFeatures);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getDefaultPattern() {

+		if(defaultPattern == null) {

+			StringBuffer sb = new StringBuffer();

+			for(int i = 0; i < features.length; i++) {

+				if(i > 0) {

+					sb.append(' ');

+				}

+				sb.append('{');

+				sb.append(i);

+				sb.append('}');

+			}

+			defaultPattern = sb.toString();

+		}

+		return defaultPattern;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setViewPattern(String viewPattern) {

+		super.setViewPattern(viewPattern);

+		viewProcessor = null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setEditorPattern(String editorPattern) {

+		super.setEditorPattern(editorPattern);

+		editorProcessor = null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected MessageFormat getViewProcessor() {

+		if(viewProcessor == null) {

+			viewProcessor = new MessageFormat(getViewPattern() == null ? getDefaultPattern() : getViewPattern());

+		}

+		return viewProcessor;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected MessageFormat getEditorProcessor() {

+		if(editorProcessor == null) {

+			editorProcessor = new MessageFormat(getEditorPattern() == null ? getDefaultEditablePattern() : getEditorPattern());

+		}

+		return editorProcessor;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getDefaultEditablePattern() {

+		if(defaultEditablePattern == null) {

+			StringBuffer sb = new StringBuffer();

+			for(int i = 0; i < editableFeatures.length; i++) {

+				if(i > 0) {

+					sb.append(' ');

+				}

+				sb.append('{');

+				sb.append(i);

+				sb.append('}');

+			}

+			defaultEditablePattern = sb.toString();

+		}

+		return defaultEditablePattern;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setEditPattern(String editPattern) {

+		super.setEditPattern(editPattern);

+		editProcessor = null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected MessageFormat getEditProcessor() {

+		if(editProcessor == null) {

+			editProcessor = new MessageFormat(getEditPattern() == null ? getDefaultEditablePattern() : getEditPattern());

+		}

+		return editProcessor;

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getEditString(IAdaptable adapter, int flags) {

+		EObject element = (EObject)adapter.getAdapter(EObject.class);

+		return getEditorProcessor().format(getEditableValues(element), new StringBuffer(), new FieldPosition(0)).toString();

+	}

+

+	/**

+	 * @generated

+	 */

+	public IParserEditStatus isValidEditString(IAdaptable adapter, String editString) {

+		ParsePosition pos = new ParsePosition(0);

+		Object[] values = getEditProcessor().parse(editString, pos);

+		if(values == null) {

+			return new ParserEditStatus(UMLDiagramEditorPlugin.ID, IParserEditStatus.UNEDITABLE, NLS.bind(Messages.MessageFormatParser_InvalidInputError, new Integer(pos.getErrorIndex())));

+		}

+		return validateNewValues(values);

+	}

+

+	/**

+	 * @generated

+	 */

+	public ICommand getParseCommand(IAdaptable adapter, String newString, int flags) {

+		Object[] values = getEditProcessor().parse(newString, new ParsePosition(0));

+		return getParseCommand(adapter, values, flags);

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getPrintString(IAdaptable adapter, int flags) {

+		EObject element = (EObject)adapter.getAdapter(EObject.class);

+		return getViewProcessor().format(getValues(element), new StringBuffer(), new FieldPosition(0)).toString();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/DiagramEditorContextMenuProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/DiagramEditorContextMenuProvider.java
index 0e8b7f4fecf..4d36ebf2206 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/DiagramEditorContextMenuProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/DiagramEditorContextMenuProvider.java
@@ -1,58 +1,58 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.part;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.ContributionItemService;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * @generated
- */
-public class DiagramEditorContextMenuProvider extends DiagramContextMenuProvider {
-	/**
-	 * @generated
-	 */
-	private IWorkbenchPart part;
-
-	/**
-	 * @generated
-	 */
-	public DiagramEditorContextMenuProvider(IWorkbenchPart part, EditPartViewer viewer) {
-		super(part, viewer);
-		this.part = part;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void buildContextMenu(final IMenuManager menu) {
-		getViewer().flush();
-		try {
-			TransactionUtil.getEditingDomain(
-					(EObject) getViewer().getContents().getModel()).runExclusive(new Runnable() {
-				public void run() {
-					ContributionItemService.getInstance().contributeToPopupMenu(
-							DiagramEditorContextMenuProvider.this, part);
-					menu.remove(ActionIds.ACTION_DELETE_FROM_MODEL);
-				}
-			});
-		} catch (Exception e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Error building context menu", e);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.part;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.transaction.util.TransactionUtil;

+import org.eclipse.gef.EditPartViewer;

+import org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.ContributionItemService;

+import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;

+import org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider;

+import org.eclipse.jface.action.IMenuManager;

+import org.eclipse.ui.IWorkbenchPart;

+

+/**

+ * @generated

+ */

+public class DiagramEditorContextMenuProvider extends DiagramContextMenuProvider {

+

+	/**

+	 * @generated

+	 */

+	private IWorkbenchPart part;

+

+	/**

+	 * @generated

+	 */

+	public DiagramEditorContextMenuProvider(IWorkbenchPart part, EditPartViewer viewer) {

+		super(part, viewer);

+		this.part = part;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void buildContextMenu(final IMenuManager menu) {

+		getViewer().flush();

+		try {

+			TransactionUtil.getEditingDomain((EObject)getViewer().getContents().getModel()).runExclusive(new Runnable() {

+

+				public void run() {

+					ContributionItemService.getInstance().contributeToPopupMenu(DiagramEditorContextMenuProvider.this, part);

+					menu.remove(ActionIds.ACTION_DELETE_FROM_MODEL);

+				}

+			});

+		} catch (Exception e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Error building context menu", e);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/LoadResourceAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/LoadResourceAction.java
index 206d5064259..1de441057e9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/LoadResourceAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/LoadResourceAction.java
@@ -1,28 +1,29 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.part;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.gmf.tooling.runtime.actions.DefaultLoadResourceAction;
-
-/**
- * @generated
- */
-public class LoadResourceAction extends DefaultLoadResourceAction {
-	/**
-	 * @generated
-	 */
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		return super.execute(event);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.part;

+

+import org.eclipse.core.commands.ExecutionEvent;

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.gmf.tooling.runtime.actions.DefaultLoadResourceAction;

+

+/**

+ * @generated

+ */

+public class LoadResourceAction extends DefaultLoadResourceAction {

+

+	/**

+	 * @generated

+	 */

+	public Object execute(ExecutionEvent event) throws ExecutionException {

+		return super.execute(event);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/Messages.java
index a178405dce6..5818dba97bc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/Messages.java
@@ -1,598 +1,739 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.part;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @generated
- */
-public class Messages extends NLS {
-	/**
-	 * @generated
-	 */
-	static {
-		NLS.initializeMessages("messages", Messages.class); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	private Messages() {
-	}
-
-	/**
-	 * @generated
-	 */
-	public static String UMLCreationWizardTitle;
-	/**
-	 * @generated
-	 */
-	public static String UMLCreationWizard_DiagramModelFilePageTitle;
-	/**
-	 * @generated
-	 */
-	public static String UMLCreationWizard_DiagramModelFilePageDescription;
-	/**
-	 * @generated
-	 */
-	public static String UMLCreationWizard_DomainModelFilePageTitle;
-	/**
-	 * @generated
-	 */
-	public static String UMLCreationWizard_DomainModelFilePageDescription;
-	/**
-	 * @generated
-	 */
-	public static String UMLCreationWizardOpenEditorError;
-	/**
-	 * @generated
-	 */
-	public static String UMLCreationWizardCreationError;
-	/**
-	 * @generated
-	 */
-	public static String UMLCreationWizardPageExtensionError;
-	/**
-	 * @generated
-	 */
-	public static String UMLDiagramEditorUtil_OpenModelResourceErrorDialogTitle;
-	/**
-	 * @generated
-	 */
-	public static String UMLDiagramEditorUtil_OpenModelResourceErrorDialogMessage;
-	/**
-	 * @generated
-	 */
-	public static String UMLDiagramEditorUtil_CreateDiagramProgressTask;
-	/**
-	 * @generated
-	 */
-	public static String UMLDiagramEditorUtil_CreateDiagramCommandLabel;
-	/**
-	 * @generated
-	 */
-	public static String UMLDocumentProvider_isModifiable;
-	/**
-	 * @generated
-	 */
-	public static String UMLDocumentProvider_handleElementContentChanged;
-	/**
-	 * @generated
-	 */
-	public static String UMLDocumentProvider_IncorrectInputError;
-	/**
-	 * @generated
-	 */
-	public static String UMLDocumentProvider_NoDiagramInResourceError;
-	/**
-	 * @generated
-	 */
-	public static String UMLDocumentProvider_DiagramLoadingError;
-	/**
-	 * @generated
-	 */
-	public static String UMLDocumentProvider_UnsynchronizedFileSaveError;
-	/**
-	 * @generated
-	 */
-	public static String UMLDocumentProvider_SaveDiagramTask;
-	/**
-	 * @generated
-	 */
-	public static String UMLDocumentProvider_SaveNextResourceTask;
-	/**
-	 * @generated
-	 */
-	public static String UMLDocumentProvider_SaveAsOperation;
-	/**
-	 * @generated
-	 */
-	public static String InitDiagramFile_ResourceErrorDialogTitle;
-	/**
-	 * @generated
-	 */
-	public static String InitDiagramFile_ResourceErrorDialogMessage;
-	/**
-	 * @generated
-	 */
-	public static String InitDiagramFile_WizardTitle;
-	/**
-	 * @generated
-	 */
-	public static String InitDiagramFile_OpenModelFileDialogTitle;
-	/**
-	 * @generated
-	 */
-	public static String UMLNewDiagramFileWizard_CreationPageName;
-	/**
-	 * @generated
-	 */
-	public static String UMLNewDiagramFileWizard_CreationPageTitle;
-	/**
-	 * @generated
-	 */
-	public static String UMLNewDiagramFileWizard_CreationPageDescription;
-	/**
-	 * @generated
-	 */
-	public static String UMLNewDiagramFileWizard_RootSelectionPageName;
-	/**
-	 * @generated
-	 */
-	public static String UMLNewDiagramFileWizard_RootSelectionPageTitle;
-	/**
-	 * @generated
-	 */
-	public static String UMLNewDiagramFileWizard_RootSelectionPageDescription;
-	/**
-	 * @generated
-	 */
-	public static String UMLNewDiagramFileWizard_RootSelectionPageSelectionTitle;
-	/**
-	 * @generated
-	 */
-	public static String UMLNewDiagramFileWizard_RootSelectionPageNoSelectionMessage;
-	/**
-	 * @generated
-	 */
-	public static String UMLNewDiagramFileWizard_RootSelectionPageInvalidSelectionMessage;
-	/**
-	 * @generated
-	 */
-	public static String UMLNewDiagramFileWizard_InitDiagramCommand;
-	/**
-	 * @generated
-	 */
-	public static String UMLNewDiagramFileWizard_IncorrectRootError;
-	/**
-	 * @generated
-	 */
-	public static String UMLDiagramEditor_SavingDeletedFile;
-	/**
-	 * @generated
-	 */
-	public static String UMLDiagramEditor_SaveAsErrorTitle;
-	/**
-	 * @generated
-	 */
-	public static String UMLDiagramEditor_SaveAsErrorMessage;
-	/**
-	 * @generated
-	 */
-	public static String UMLDiagramEditor_SaveErrorTitle;
-	/**
-	 * @generated
-	 */
-	public static String UMLDiagramEditor_SaveErrorMessage;
-	/**
-	 * @generated
-	 */
-	public static String UMLElementChooserDialog_SelectModelElementTitle;
-	/**
-	 * @generated
-	 */
-	public static String ModelElementSelectionPageMessage;
-	/**
-	 * @generated
-	 */
-	public static String ValidateActionMessage;
-	/**
-	 * @generated
-	 */
-	public static String NodesGroup_title;
-	/**
-	 * @generated
-	 */
-	public static String NodesGroup_desc;
-	/**
-	 * @generated
-	 */
-	public static String EdgesGroup_title;
-	/**
-	 * @generated
-	 */
-	public static String EdgesGroup_desc;
-	/**
-	 * @generated
-	 */
-	public static String ClassCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String ClassCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String PropertyCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String PropertyCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String PortCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String PortCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String CollaborationCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String CollaborationCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String CollaborationRoleCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String CollaborationRoleCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String CollaborationUseCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String CollaborationUseCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String CommentCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String CommentCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String ConstraintCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String ConstraintCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String TimeObservationCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String TimeObservationCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String DurationObservationCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String DurationObservationCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String InformationItemCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String InformationItemCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String ParameterCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String ParameterCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String ActivityCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String ActivityCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String InteractionCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String InteractionCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String ProtocolStateMachineCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String ProtocolStateMachineCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String StateMachineCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String StateMachineCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String FunctionBehaviorCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String FunctionBehaviorCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String OpaqueBehaviorCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String OpaqueBehaviorCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String LinkCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String LinkCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String ConnectorCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String ConnectorCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String RoleBindingCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String RoleBindingCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String GeneralizationCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String GeneralizationCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String RealizationCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String RealizationCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String SubstitutionCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String SubstitutionCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String AbstractionCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String AbstractionCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String UsageCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String UsageCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String DependencyCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String DependencyCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String RepresentationCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String RepresentationCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String InformationFlowCreationTool_title;
-	/**
-	 * @generated
-	 */
-	public static String InformationFlowCreationTool_desc;
-	/**
-	 * @generated
-	 */
-	public static String DataTypeAttributeCompartmentEditPart_title;
-	/**
-	 * @generated
-	 */
-	public static String DataTypeOperationCompartmentEditPart_title;
-	/**
-	 * @generated
-	 */
-	public static String DataTypeAttributeCompartmentEditPartCN_title;
-	/**
-	 * @generated
-	 */
-	public static String DataTypeOperationCompartmentEditPartCN_title;
-	/**
-	 * @generated
-	 */
-	public static String EnumerationEnumerationLiteralCompartmentEditPart_title;
-	/**
-	 * @generated
-	 */
-	public static String EnumerationEnumerationLiteralCompartmentEditPartCN_title;
-	/**
-	 * @generated
-	 */
-	public static String ActivityCompositeCompartmentEditPartCN_title;
-	/**
-	 * @generated
-	 */
-	public static String InteractionCompositeCompartmentEditPartCN_title;
-	/**
-	 * @generated
-	 */
-	public static String ProtocolStateMachineCompositeCompartmentEditPartCN_title;
-	/**
-	 * @generated
-	 */
-	public static String StateMachineCompositeCompartmentEditPartCN_title;
-	/**
-	 * @generated
-	 */
-	public static String FunctionBehaviorCompositeCompartmentEditPartCN_title;
-	/**
-	 * @generated
-	 */
-	public static String OpaqueBehaviorCompositeCompartmentEditPartCN_title;
-	/**
-	 * @generated
-	 */
-	public static String ComponentCompositeCompartmentEditPartCN_title;
-	/**
-	 * @generated
-	 */
-	public static String DeviceCompositeCompartmentEditPartCN_title;
-	/**
-	 * @generated
-	 */
-	public static String ExecutionEnvironmentCompositeCompartmentEditPartCN_title;
-	/**
-	 * @generated
-	 */
-	public static String NodeCompositeCompartmentEditPartCN_title;
-	/**
-	 * @generated
-	 */
-	public static String ClassCompositeCompartmentEditPartCN_title;
-	/**
-	 * @generated
-	 */
-	public static String CollaborationCompositeCompartmentEditPartCN_title;
-	/**
-	 * @generated
-	 */
-	public static String ActivityCompositeCompartmentEditPart_title;
-	/**
-	 * @generated
-	 */
-	public static String InteractionCompositeCompartmentEditPart_title;
-	/**
-	 * @generated
-	 */
-	public static String ProtocolStateMachineCompositeCompartmentEditPart_title;
-	/**
-	 * @generated
-	 */
-	public static String StateMachineCompositeCompartmentEditPart_title;
-	/**
-	 * @generated
-	 */
-	public static String FunctionBehaviorCompositeCompartmentEditPart_title;
-	/**
-	 * @generated
-	 */
-	public static String OpaqueBehaviorCompositeCompartmentEditPart_title;
-	/**
-	 * @generated
-	 */
-	public static String ComponentCompositeCompartmentEditPart_title;
-	/**
-	 * @generated
-	 */
-	public static String DeviceCompositeCompartmentEditPart_title;
-	/**
-	 * @generated
-	 */
-	public static String ExecutionEnvironmentCompositeCompartmentEditPart_title;
-	/**
-	 * @generated
-	 */
-	public static String NodeCompositeCompartmentEditPart_title;
-	/**
-	 * @generated
-	 */
-	public static String ClassCompositeCompartmentEditPart_title;
-	/**
-	 * @generated
-	 */
-	public static String CollaborationCompositeCompartmentEditPart_title;
-	/**
-	 * @generated
-	 */
-	public static String PropertyPartCompartmentEditPartCN_title;
-	/**
-	 * @generated
-	 */
-	public static String CommandName_OpenDiagram;
-	/**
-	 * @generated
-	 */
-	public static String MessageFormatParser_InvalidInputError;
-	/**
-	 * @generated
-	 */
-	public static String UMLModelingAssistantProviderTitle;
-	/**
-	 * @generated
-	 */
-	public static String UMLModelingAssistantProviderMessage;
-	//TODO: put accessor fields manually	
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.part;

+

+import org.eclipse.osgi.util.NLS;

+

+/**

+ * @generated

+ */

+public class Messages extends NLS {

+

+	/**

+	 * @generated

+	 */

+	static {

+		NLS.initializeMessages("messages", Messages.class); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	private Messages() {

+	}

+

+	/**

+	 * @generated

+	 */

+	public static String UMLCreationWizardTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLCreationWizard_DiagramModelFilePageTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLCreationWizard_DiagramModelFilePageDescription;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLCreationWizard_DomainModelFilePageTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLCreationWizard_DomainModelFilePageDescription;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLCreationWizardOpenEditorError;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLCreationWizardCreationError;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLCreationWizardPageExtensionError;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLDiagramEditorUtil_OpenModelResourceErrorDialogTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLDiagramEditorUtil_OpenModelResourceErrorDialogMessage;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLDiagramEditorUtil_CreateDiagramProgressTask;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLDiagramEditorUtil_CreateDiagramCommandLabel;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLDocumentProvider_isModifiable;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLDocumentProvider_handleElementContentChanged;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLDocumentProvider_IncorrectInputError;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLDocumentProvider_NoDiagramInResourceError;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLDocumentProvider_DiagramLoadingError;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLDocumentProvider_UnsynchronizedFileSaveError;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLDocumentProvider_SaveDiagramTask;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLDocumentProvider_SaveNextResourceTask;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLDocumentProvider_SaveAsOperation;

+

+	/**

+	 * @generated

+	 */

+	public static String InitDiagramFile_ResourceErrorDialogTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String InitDiagramFile_ResourceErrorDialogMessage;

+

+	/**

+	 * @generated

+	 */

+	public static String InitDiagramFile_WizardTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String InitDiagramFile_OpenModelFileDialogTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLNewDiagramFileWizard_CreationPageName;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLNewDiagramFileWizard_CreationPageTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLNewDiagramFileWizard_CreationPageDescription;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLNewDiagramFileWizard_RootSelectionPageName;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLNewDiagramFileWizard_RootSelectionPageTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLNewDiagramFileWizard_RootSelectionPageDescription;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLNewDiagramFileWizard_RootSelectionPageSelectionTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLNewDiagramFileWizard_RootSelectionPageNoSelectionMessage;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLNewDiagramFileWizard_RootSelectionPageInvalidSelectionMessage;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLNewDiagramFileWizard_InitDiagramCommand;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLNewDiagramFileWizard_IncorrectRootError;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLDiagramEditor_SavingDeletedFile;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLDiagramEditor_SaveAsErrorTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLDiagramEditor_SaveAsErrorMessage;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLDiagramEditor_SaveErrorTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLDiagramEditor_SaveErrorMessage;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLElementChooserDialog_SelectModelElementTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String ModelElementSelectionPageMessage;

+

+	/**

+	 * @generated

+	 */

+	public static String ValidateActionMessage;

+

+	/**

+	 * @generated

+	 */

+	public static String NodesGroup_title;

+

+	/**

+	 * @generated

+	 */

+	public static String NodesGroup_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String EdgesGroup_title;

+

+	/**

+	 * @generated

+	 */

+	public static String EdgesGroup_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String ClassCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ClassCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String PropertyCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String PropertyCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String PortCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String PortCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String CollaborationCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String CollaborationCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String CollaborationRoleCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String CollaborationRoleCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String CollaborationUseCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String CollaborationUseCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String CommentCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String CommentCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String ConstraintCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConstraintCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String TimeObservationCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String TimeObservationCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String DurationObservationCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String DurationObservationCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String InformationItemCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String InformationItemCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String ParameterCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ParameterCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String ActivityCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ActivityCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String InteractionCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String InteractionCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String ProtocolStateMachineCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ProtocolStateMachineCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String StateMachineCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String StateMachineCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String FunctionBehaviorCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String FunctionBehaviorCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String OpaqueBehaviorCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String OpaqueBehaviorCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String LinkCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String LinkCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String ConnectorCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ConnectorCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String RoleBindingCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String RoleBindingCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String GeneralizationCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String GeneralizationCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String RealizationCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String RealizationCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String SubstitutionCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String SubstitutionCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String AbstractionCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String AbstractionCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String UsageCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String UsageCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String DependencyCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String DependencyCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String RepresentationCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String RepresentationCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String InformationFlowCreationTool_title;

+

+	/**

+	 * @generated

+	 */

+	public static String InformationFlowCreationTool_desc;

+

+	/**

+	 * @generated

+	 */

+	public static String DataTypeAttributeCompartmentEditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String DataTypeOperationCompartmentEditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String DataTypeAttributeCompartmentEditPartCN_title;

+

+	/**

+	 * @generated

+	 */

+	public static String DataTypeOperationCompartmentEditPartCN_title;

+

+	/**

+	 * @generated

+	 */

+	public static String EnumerationEnumerationLiteralCompartmentEditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String EnumerationEnumerationLiteralCompartmentEditPartCN_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ActivityCompositeCompartmentEditPartCN_title;

+

+	/**

+	 * @generated

+	 */

+	public static String InteractionCompositeCompartmentEditPartCN_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ProtocolStateMachineCompositeCompartmentEditPartCN_title;

+

+	/**

+	 * @generated

+	 */

+	public static String StateMachineCompositeCompartmentEditPartCN_title;

+

+	/**

+	 * @generated

+	 */

+	public static String FunctionBehaviorCompositeCompartmentEditPartCN_title;

+

+	/**

+	 * @generated

+	 */

+	public static String OpaqueBehaviorCompositeCompartmentEditPartCN_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ComponentCompositeCompartmentEditPartCN_title;

+

+	/**

+	 * @generated

+	 */

+	public static String DeviceCompositeCompartmentEditPartCN_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ExecutionEnvironmentCompositeCompartmentEditPartCN_title;

+

+	/**

+	 * @generated

+	 */

+	public static String NodeCompositeCompartmentEditPartCN_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ClassCompositeCompartmentEditPartCN_title;

+

+	/**

+	 * @generated

+	 */

+	public static String CollaborationCompositeCompartmentEditPartCN_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ActivityCompositeCompartmentEditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String InteractionCompositeCompartmentEditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ProtocolStateMachineCompositeCompartmentEditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String StateMachineCompositeCompartmentEditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String FunctionBehaviorCompositeCompartmentEditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String OpaqueBehaviorCompositeCompartmentEditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ComponentCompositeCompartmentEditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String DeviceCompositeCompartmentEditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ExecutionEnvironmentCompositeCompartmentEditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String NodeCompositeCompartmentEditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String ClassCompositeCompartmentEditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String CollaborationCompositeCompartmentEditPart_title;

+

+	/**

+	 * @generated

+	 */

+	public static String PropertyPartCompartmentEditPartCN_title;

+

+	/**

+	 * @generated

+	 */

+	public static String CommandName_OpenDiagram;

+

+	/**

+	 * @generated

+	 */

+	public static String MessageFormatParser_InvalidInputError;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLModelingAssistantProviderTitle;

+

+	/**

+	 * @generated

+	 */

+	public static String UMLModelingAssistantProviderMessage;

+	//TODO: put accessor fields manually	

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/ModelElementSelectionPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/ModelElementSelectionPage.java
index 4e18c736389..b9ec5286bf8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/ModelElementSelectionPage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/ModelElementSelectionPage.java
@@ -1,35 +1,38 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.part;
-
-import org.eclipse.gmf.tooling.runtime.part.DefaultModelElementSelectionPage;
-
-/**
- * Wizard page that allows to select element from model.
- * @generated
- */
-public class ModelElementSelectionPage extends DefaultModelElementSelectionPage {
-	/**
-	 * @generated
-	 */
-	public ModelElementSelectionPage(String pageName) {
-		super(UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory(), pageName);
-	}
-
-	/**
-	 * Override to provide custom model element description.
-	 * @generated
-	 */
-	protected String getSelectionTitle() {
-		return Messages.ModelElementSelectionPageMessage;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.part;

+

+import org.eclipse.gmf.tooling.runtime.part.DefaultModelElementSelectionPage;

+

+/**

+ * Wizard page that allows to select element from model.

+ * 

+ * @generated

+ */

+public class ModelElementSelectionPage extends DefaultModelElementSelectionPage {

+

+	/**

+	 * @generated

+	 */

+	public ModelElementSelectionPage(String pageName) {

+		super(UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory(), pageName);

+	}

+

+	/**

+	 * Override to provide custom model element description.

+	 * 

+	 * @generated

+	 */

+	protected String getSelectionTitle() {

+		return Messages.ModelElementSelectionPageMessage;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizard.java
index a1a79cbb03c..9ae6b8516b1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizard.java
@@ -1,165 +1,165 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.part;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-
-/**
- * @generated
- */
-public class UMLCreationWizard
-		extends Wizard implements INewWizard {
-	/**
-	 * @generated
-	 */
-	private IWorkbench workbench;
-	/**
-	 * @generated
-	 */
-	protected IStructuredSelection selection;
-	/**
-	 * @generated
-	 */
-	protected UMLCreationWizardPage diagramModelFilePage;
-	/**
-	 * @generated
-	 */
-	protected UMLCreationWizardPage domainModelFilePage;
-	/**
-	 * @generated
-	 */
-	protected Resource diagram;
-	/**
-	 * @generated
-	 */
-	private boolean openNewlyCreatedDiagramEditor = true;
-
-	/**
-	 * @generated
-	 */
-	public IWorkbench getWorkbench() {
-		return workbench;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IStructuredSelection getSelection() {
-		return selection;
-	}
-
-	/**
-	 * @generated
-	 */
-	public final Resource getDiagram() {
-		return diagram;
-	}
-
-	/**
-	 * @generated
-	 */
-	public final boolean isOpenNewlyCreatedDiagramEditor() {
-		return openNewlyCreatedDiagramEditor;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setOpenNewlyCreatedDiagramEditor(boolean openNewlyCreatedDiagramEditor) {
-		this.openNewlyCreatedDiagramEditor = openNewlyCreatedDiagramEditor;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		this.workbench = workbench;
-		this.selection = selection;
-		setWindowTitle(Messages.UMLCreationWizardTitle);
-		setDefaultPageImageDescriptor(UMLDiagramEditorPlugin.getBundledImageDescriptor("icons/wizban/NewUMLWizard.gif")); //$NON-NLS-1$
-		setNeedsProgressMonitor(true);
-	}
-
-	/**
-	 * @generated
-	 */
-	public void addPages() {
-		diagramModelFilePage = new UMLCreationWizardPage("DiagramModelFile", getSelection(), "uml_csd"); //$NON-NLS-1$ //$NON-NLS-2$
-		diagramModelFilePage.setTitle(Messages.UMLCreationWizard_DiagramModelFilePageTitle);
-		diagramModelFilePage.setDescription(Messages.UMLCreationWizard_DiagramModelFilePageDescription);
-		addPage(diagramModelFilePage);
-		domainModelFilePage = new UMLCreationWizardPage("DomainModelFile", getSelection(), "uml") { //$NON-NLS-1$ //$NON-NLS-2$
-			public void setVisible(boolean visible) {
-				if (visible) {
-					String fileName = diagramModelFilePage.getFileName();
-					fileName = fileName.substring(0, fileName.length() - ".uml_csd".length()); //$NON-NLS-1$
-					setFileName(UMLDiagramEditorUtil.getUniqueFileName(
-							getContainerFullPath(), fileName, "uml")); //$NON-NLS-1$
-				}
-				super.setVisible(visible);
-			}
-		};
-		domainModelFilePage.setTitle(Messages.UMLCreationWizard_DomainModelFilePageTitle);
-		domainModelFilePage.setDescription(Messages.UMLCreationWizard_DomainModelFilePageDescription);
-		addPage(domainModelFilePage);
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean performFinish() {
-		IRunnableWithProgress op =
-				new WorkspaceModifyOperation(null) {
-					protected void execute(IProgressMonitor monitor)
-							throws CoreException, InterruptedException {
-						diagram = UMLDiagramEditorUtil.createDiagram(diagramModelFilePage.getURI(),
-								domainModelFilePage.getURI(),
-								monitor);
-						if (isOpenNewlyCreatedDiagramEditor() && diagram != null) {
-							try {
-								UMLDiagramEditorUtil.openDiagram(diagram);
-							} catch (PartInitException e) {
-								ErrorDialog.openError(getContainer().getShell(),
-										Messages.UMLCreationWizardOpenEditorError, null, e.getStatus());
-							}
-						}
-					}
-				};
-		try {
-			getContainer().run(false, true, op);
-		} catch (InterruptedException e) {
-			return false;
-		} catch (InvocationTargetException e) {
-			if (e.getTargetException() instanceof CoreException) {
-				ErrorDialog.openError(getContainer().getShell(),
-						Messages.UMLCreationWizardCreationError, null,
-						((CoreException) e.getTargetException()).getStatus());
-			} else {
-				UMLDiagramEditorPlugin.getInstance().logError("Error creating diagram", e.getTargetException()); //$NON-NLS-1$
-			}
-			return false;
-		}
-		return diagram != null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.part;

+

+import java.lang.reflect.InvocationTargetException;

+

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.jface.dialogs.ErrorDialog;

+import org.eclipse.jface.operation.IRunnableWithProgress;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.jface.wizard.Wizard;

+import org.eclipse.ui.INewWizard;

+import org.eclipse.ui.IWorkbench;

+import org.eclipse.ui.PartInitException;

+import org.eclipse.ui.actions.WorkspaceModifyOperation;

+

+/**

+ * @generated

+ */

+public class UMLCreationWizard extends Wizard implements INewWizard {

+

+	/**

+	 * @generated

+	 */

+	private IWorkbench workbench;

+

+	/**

+	 * @generated

+	 */

+	protected IStructuredSelection selection;

+

+	/**

+	 * @generated

+	 */

+	protected UMLCreationWizardPage diagramModelFilePage;

+

+	/**

+	 * @generated

+	 */

+	protected UMLCreationWizardPage domainModelFilePage;

+

+	/**

+	 * @generated

+	 */

+	protected Resource diagram;

+

+	/**

+	 * @generated

+	 */

+	private boolean openNewlyCreatedDiagramEditor = true;

+

+	/**

+	 * @generated

+	 */

+	public IWorkbench getWorkbench() {

+		return workbench;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IStructuredSelection getSelection() {

+		return selection;

+	}

+

+	/**

+	 * @generated

+	 */

+	public final Resource getDiagram() {

+		return diagram;

+	}

+

+	/**

+	 * @generated

+	 */

+	public final boolean isOpenNewlyCreatedDiagramEditor() {

+		return openNewlyCreatedDiagramEditor;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setOpenNewlyCreatedDiagramEditor(boolean openNewlyCreatedDiagramEditor) {

+		this.openNewlyCreatedDiagramEditor = openNewlyCreatedDiagramEditor;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init(IWorkbench workbench, IStructuredSelection selection) {

+		this.workbench = workbench;

+		this.selection = selection;

+		setWindowTitle(Messages.UMLCreationWizardTitle);

+		setDefaultPageImageDescriptor(UMLDiagramEditorPlugin.getBundledImageDescriptor("icons/wizban/NewUMLWizard.gif")); //$NON-NLS-1$

+		setNeedsProgressMonitor(true);

+	}

+

+	/**

+	 * @generated

+	 */

+	public void addPages() {

+		diagramModelFilePage = new UMLCreationWizardPage("DiagramModelFile", getSelection(), "uml_csd"); //$NON-NLS-1$ //$NON-NLS-2$

+		diagramModelFilePage.setTitle(Messages.UMLCreationWizard_DiagramModelFilePageTitle);

+		diagramModelFilePage.setDescription(Messages.UMLCreationWizard_DiagramModelFilePageDescription);

+		addPage(diagramModelFilePage);

+

+		domainModelFilePage = new UMLCreationWizardPage("DomainModelFile", getSelection(), "uml") { //$NON-NLS-1$ //$NON-NLS-2$

+

+			public void setVisible(boolean visible) {

+				if(visible) {

+					String fileName = diagramModelFilePage.getFileName();

+					fileName = fileName.substring(0, fileName.length() - ".uml_csd".length()); //$NON-NLS-1$

+					setFileName(UMLDiagramEditorUtil.getUniqueFileName(getContainerFullPath(), fileName, "uml")); //$NON-NLS-1$

+				}

+				super.setVisible(visible);

+			}

+		};

+		domainModelFilePage.setTitle(Messages.UMLCreationWizard_DomainModelFilePageTitle);

+		domainModelFilePage.setDescription(Messages.UMLCreationWizard_DomainModelFilePageDescription);

+		addPage(domainModelFilePage);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean performFinish() {

+		IRunnableWithProgress op = new WorkspaceModifyOperation(null) {

+

+			protected void execute(IProgressMonitor monitor) throws CoreException, InterruptedException {

+				diagram = UMLDiagramEditorUtil.createDiagram(diagramModelFilePage.getURI(), domainModelFilePage.getURI(), monitor);

+				if(isOpenNewlyCreatedDiagramEditor() && diagram != null) {

+					try {

+						UMLDiagramEditorUtil.openDiagram(diagram);

+					} catch (PartInitException e) {

+						ErrorDialog.openError(getContainer().getShell(), Messages.UMLCreationWizardOpenEditorError, null, e.getStatus());

+					}

+				}

+			}

+		};

+		try {

+			getContainer().run(false, true, op);

+		} catch (InterruptedException e) {

+			return false;

+		} catch (InvocationTargetException e) {

+			if(e.getTargetException() instanceof CoreException) {

+				ErrorDialog.openError(getContainer().getShell(), Messages.UMLCreationWizardCreationError, null, ((CoreException)e.getTargetException()).getStatus());

+			} else {

+				UMLDiagramEditorPlugin.getInstance().logError("Error creating diagram", e.getTargetException()); //$NON-NLS-1$

+			}

+			return false;

+		}

+		return diagram != null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizardPage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizardPage.java
index ff28fe5520b..8fc3cc6f01b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizardPage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLCreationWizardPage.java
@@ -1,96 +1,94 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.part;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-
-/**
- * @generated
- */
-public class UMLCreationWizardPage extends WizardNewFileCreationPage {
-	/**
-	 * @generated
-	 */
-	private final String fileExtension;
-
-	/**
-	 * @generated
-	 */
-	public UMLCreationWizardPage(String pageName,
-			IStructuredSelection selection, String fileExtension) {
-		super(pageName, selection);
-		this.fileExtension = fileExtension;
-	}
-
-	/**
-	 * Override to create files with this extension.
-	 * 
-	 * @generated
-	 */
-	protected String getExtension() {
-		return fileExtension;
-	}
-
-	/**
-	 * @generated
-	 */
-	public URI getURI() {
-		return URI.createPlatformResourceURI(getFilePath().toString(), false);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IPath getFilePath() {
-		IPath path = getContainerFullPath();
-		if (path == null) {
-			path = new Path(""); //$NON-NLS-1$
-		}
-		String fileName = getFileName();
-		if (fileName != null) {
-			path = path.append(fileName);
-		}
-		return path;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void createControl(Composite parent) {
-		super.createControl(parent);
-		setFileName(UMLDiagramEditorUtil.getUniqueFileName(
-				getContainerFullPath(), getFileName(), getExtension()));
-		setPageComplete(validatePage());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean validatePage() {
-		if (!super.validatePage()) {
-			return false;
-		}
-		String extension = getExtension();
-		if (extension != null && !getFilePath().toString().endsWith("." + extension)) {
-			setErrorMessage(NLS.bind(
-					Messages.UMLCreationWizardPageExtensionError, extension));
-			return false;
-		}
-		return true;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.part;

+

+import org.eclipse.core.runtime.IPath;

+import org.eclipse.core.runtime.Path;

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.osgi.util.NLS;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

+

+/**

+ * @generated

+ */

+public class UMLCreationWizardPage extends WizardNewFileCreationPage {

+

+	/**

+	 * @generated

+	 */

+	private final String fileExtension;

+

+	/**

+	 * @generated

+	 */

+	public UMLCreationWizardPage(String pageName, IStructuredSelection selection, String fileExtension) {

+		super(pageName, selection);

+		this.fileExtension = fileExtension;

+	}

+

+	/**

+	 * Override to create files with this extension.

+	 * 

+	 * @generated

+	 */

+	protected String getExtension() {

+		return fileExtension;

+	}

+

+	/**

+	 * @generated

+	 */

+	public URI getURI() {

+		return URI.createPlatformResourceURI(getFilePath().toString(), false);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IPath getFilePath() {

+		IPath path = getContainerFullPath();

+		if(path == null) {

+			path = new Path(""); //$NON-NLS-1$

+		}

+		String fileName = getFileName();

+		if(fileName != null) {

+			path = path.append(fileName);

+		}

+		return path;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void createControl(Composite parent) {

+		super.createControl(parent);

+		setFileName(UMLDiagramEditorUtil.getUniqueFileName(getContainerFullPath(), getFileName(), getExtension()));

+		setPageComplete(validatePage());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean validatePage() {

+		if(!super.validatePage()) {

+			return false;

+		}

+		String extension = getExtension();

+		if(extension != null && !getFilePath().toString().endsWith("." + extension)) {

+			setErrorMessage(NLS.bind(Messages.UMLCreationWizardPageExtensionError, extension));

+			return false;

+		}

+		return true;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramActionBarContributor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramActionBarContributor.java
index 763f234c73a..e27930b693b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramActionBarContributor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramActionBarContributor.java
@@ -1,57 +1,58 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.part;
-
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramActionBarContributor;
-import org.eclipse.jface.action.GroupMarker;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchPage;
-
-/**
- * @generated
- */
-public class UMLDiagramActionBarContributor extends DiagramActionBarContributor {
-	/**
-	 * @generated
-	 */
-	protected Class<UMLDiagramEditor> getEditorClass() {
-		return UMLDiagramEditor.class;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getEditorId() {
-		return UMLDiagramEditor.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init(IActionBars bars, IWorkbenchPage page) {
-		super.init(bars, page);
-		// print preview
-		IMenuManager fileMenu = bars.getMenuManager().findMenuUsingPath(IWorkbenchActionConstants.M_FILE);
-		assert fileMenu != null;
-		fileMenu.remove("pageSetupAction"); //$NON-NLS-1$
-		IMenuManager editMenu = bars.getMenuManager().findMenuUsingPath(IWorkbenchActionConstants.M_EDIT);
-		assert editMenu != null;
-		if (editMenu.find("validationGroup") == null) { //$NON-NLS-1$
-			editMenu.add(new GroupMarker("validationGroup")); //$NON-NLS-1$
-		}
-		IAction validateAction = new ValidateAction(page);
-		editMenu.appendToGroup("validationGroup", validateAction); //$NON-NLS-1$
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.part;

+

+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramActionBarContributor;

+import org.eclipse.jface.action.GroupMarker;

+import org.eclipse.jface.action.IAction;

+import org.eclipse.jface.action.IMenuManager;

+import org.eclipse.ui.IActionBars;

+import org.eclipse.ui.IWorkbenchActionConstants;

+import org.eclipse.ui.IWorkbenchPage;

+

+/**

+ * @generated

+ */

+public class UMLDiagramActionBarContributor extends DiagramActionBarContributor {

+

+	/**

+	 * @generated

+	 */

+	protected Class<UMLDiagramEditor> getEditorClass() {

+		return UMLDiagramEditor.class;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getEditorId() {

+		return UMLDiagramEditor.ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init(IActionBars bars, IWorkbenchPage page) {

+		super.init(bars, page);

+		// print preview

+		IMenuManager fileMenu = bars.getMenuManager().findMenuUsingPath(IWorkbenchActionConstants.M_FILE);

+		assert fileMenu != null;

+		fileMenu.remove("pageSetupAction"); //$NON-NLS-1$

+		IMenuManager editMenu = bars.getMenuManager().findMenuUsingPath(IWorkbenchActionConstants.M_EDIT);

+		assert editMenu != null;

+		if(editMenu.find("validationGroup") == null) { //$NON-NLS-1$

+			editMenu.add(new GroupMarker("validationGroup")); //$NON-NLS-1$

+		}

+		IAction validateAction = new ValidateAction(page);

+		editMenu.appendToGroup("validationGroup", validateAction); //$NON-NLS-1$

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramContentInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramContentInitializer.java
index b5b55688362..50fe9dd3160 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramContentInitializer.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramContentInitializer.java
@@ -1,1536 +1,1538 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.part;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Map;
-
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.*;
-import org.eclipse.uml2.uml.Package;
-
-/**
- * @generated
- */
-public class UMLDiagramContentInitializer {
-	/**
-	 * @generated
-	 */
-	private Map myDomain2NotationMap = new HashMap();
-	/**
-	 * @generated
-	 */
-	private Collection myLinkDescriptors = new LinkedList();
-
-	/**
-	 * @generated
-	 */
-	public void initDiagramContent(Diagram diagram) {
-		if (!CompositeStructureDiagramEditPart.MODEL_ID.equals(diagram.getType())) {
-			UMLDiagramEditorPlugin.getInstance().logError("Incorrect diagram passed as a parameter: " + diagram.getType());
-			return;
-		}
-		if (false == diagram.getElement() instanceof Package) {
-			UMLDiagramEditorPlugin.getInstance().logError("Incorrect diagram element specified: " + diagram.getElement() + " instead of Package");
-			return;
-		}
-		createPackage_1000Children(diagram);
-		createLinks(diagram);
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createPackage_1000Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getPackage_1000SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createActivity_2060Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getActivity_2060OutgoingLinks(view));
-		Collection childNodeDescriptors = UMLDiagramUpdater.getActivity_2060SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-		createActivityInternalstructure_7063Children(getCompartment(view, ActivityCompositeCompartmentEditPart.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createInteraction_2061Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getInteraction_2061OutgoingLinks(view));
-		Collection childNodeDescriptors = UMLDiagramUpdater.getInteraction_2061SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-		createInteractionInternalstructure_7064Children(getCompartment(view, InteractionCompositeCompartmentEditPart.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createProtocolStateMachine_2062Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getProtocolStateMachine_2062OutgoingLinks(view));
-		Collection childNodeDescriptors = UMLDiagramUpdater.getProtocolStateMachine_2062SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-		createProtocolStateMachineInternalstructure_7065Children(getCompartment(view, ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createStateMachine_2063Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getStateMachine_2063OutgoingLinks(view));
-		Collection childNodeDescriptors = UMLDiagramUpdater.getStateMachine_2063SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-		createStateMachineInternalstructure_7066Children(getCompartment(view, StateMachineCompositeCompartmentEditPart.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createFunctionBehavior_2064Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getFunctionBehavior_2064OutgoingLinks(view));
-		Collection childNodeDescriptors = UMLDiagramUpdater.getFunctionBehavior_2064SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-		createFunctionBehaviorInternalstructure_7067Children(getCompartment(view, FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createOpaqueBehavior_2065Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getOpaqueBehavior_2065OutgoingLinks(view));
-		Collection childNodeDescriptors = UMLDiagramUpdater.getOpaqueBehavior_2065SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-		createOpaqueBehaviorInternalstructure_7068Children(getCompartment(view, OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createComponent_2069Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getComponent_2069OutgoingLinks(view));
-		Collection childNodeDescriptors = UMLDiagramUpdater.getComponent_2069SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-		createComponentInternalstructure_7069Children(getCompartment(view, ComponentCompositeCompartmentEditPart.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createDevice_2070Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getDevice_2070OutgoingLinks(view));
-		Collection childNodeDescriptors = UMLDiagramUpdater.getDevice_2070SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-		createDeviceInternalstructure_7070Children(getCompartment(view, DeviceCompositeCompartmentEditPart.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createExecutionEnvironment_2071Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getExecutionEnvironment_2071OutgoingLinks(view));
-		Collection childNodeDescriptors = UMLDiagramUpdater.getExecutionEnvironment_2071SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-		createExecutionEnvironmentInternalstructure_7071Children(getCompartment(view, ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createNode_2072Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getNode_2072OutgoingLinks(view));
-		Collection childNodeDescriptors = UMLDiagramUpdater.getNode_2072SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-		createNodeInternalstructure_7072Children(getCompartment(view, NodeCompositeCompartmentEditPart.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createClass_2073Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getClass_2073OutgoingLinks(view));
-		Collection childNodeDescriptors = UMLDiagramUpdater.getClass_2073SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-		createClassInternalstructure_7073Children(getCompartment(view, ClassCompositeCompartmentEditPart.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createCollaboration_2075Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getCollaboration_2075OutgoingLinks(view));
-		createCollaborationInternalstructure_7075Children(getCompartment(view, CollaborationCompositeCompartmentEditPart.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createInterface_2076Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getInterface_2076OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createPrimitiveType_2066Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getPrimitiveType_2066OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createEnumeration_2067Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getEnumeration_2067OutgoingLinks(view));
-		Collection childNodeDescriptors = UMLDiagramUpdater.getEnumeration_2067SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-		createEnumerationLiterals_7048Children(getCompartment(view, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createDataType_2068Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getDataType_2068OutgoingLinks(view));
-		createDataTypeAttributes_7033Children(getCompartment(view, DataTypeAttributeCompartmentEditPart.VISUAL_ID));
-		createDataTypeOperations_7034Children(getCompartment(view, DataTypeOperationCompartmentEditPart.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createActor_2077Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getActor_2077OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createDeploymentSpecification_2078Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getDeploymentSpecification_2078OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createArtifact_2079Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getArtifact_2079OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createInformationItem_2080Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getInformationItem_2080OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createSignal_2081Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getSignal_2081OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createUseCase_2082Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getUseCase_2082OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createSignalEvent_2083Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getSignalEvent_2083OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createCallEvent_2084Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getCallEvent_2084OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createAnyReceiveEvent_2085Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getAnyReceiveEvent_2085OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createChangeEvent_2088Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getChangeEvent_2088OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createTimeEvent_2089Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getTimeEvent_2089OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createDurationObservation_2093Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getDurationObservation_2093OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createTimeObservation_2094Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getTimeObservation_2094OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createLiteralBoolean_2095Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getLiteralBoolean_2095OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createLiteralInteger_2096Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getLiteralInteger_2096OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createLiteralNull_2097Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getLiteralNull_2097OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createLiteralString_2098Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getLiteralString_2098OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createLiteralUnlimitedNatural_2099Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getLiteralUnlimitedNatural_2099OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createStringExpression_2100Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getStringExpression_2100OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createOpaqueExpression_2101Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getOpaqueExpression_2101OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createTimeExpression_2102Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getTimeExpression_2102OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createExpression_2103Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getExpression_2103OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createDuration_2104Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getDuration_2104OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createTimeInterval_2105Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getTimeInterval_2105OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createDurationInterval_2106Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getDurationInterval_2106OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createInterval_2107Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getInterval_2107OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createInstanceValue_2108Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getInstanceValue_2108OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createComment_2109Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getComment_2109OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createDurationConstraint_2110Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getDurationConstraint_2110OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createTimeConstraint_2111Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getTimeConstraint_2111OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createIntervalConstraint_2112Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getIntervalConstraint_2112OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createInteractionConstraint_2113Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getInteractionConstraint_2113OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createConstraint_2114Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getConstraint_2114OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createPort_3069Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getPort_3069OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createParameter_3088Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getParameter_3088OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createProperty_3070Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getProperty_3070OutgoingLinks(view));
-		Collection childNodeDescriptors = UMLDiagramUpdater.getProperty_3070SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-		createPropertyInternalstructure_7077Children(getCompartment(view, PropertyPartCompartmentEditPartCN.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createConnectableElement_3115Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getConnectableElement_3115OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createCollaborationUse_3071Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getCollaborationUse_3071OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createActivity_3072Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getActivity_3072OutgoingLinks(view));
-		Collection childNodeDescriptors = UMLDiagramUpdater.getActivity_3072SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-		createActivityInternalstructure_7050Children(getCompartment(view, ActivityCompositeCompartmentEditPartCN.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createInteraction_3073Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getInteraction_3073OutgoingLinks(view));
-		Collection childNodeDescriptors = UMLDiagramUpdater.getInteraction_3073SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-		createInteractionInternalstructure_7051Children(getCompartment(view, InteractionCompositeCompartmentEditPartCN.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createProtocolStateMachine_3074Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getProtocolStateMachine_3074OutgoingLinks(view));
-		Collection childNodeDescriptors = UMLDiagramUpdater.getProtocolStateMachine_3074SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-		createProtocolStateMachineInternalstructure_7052Children(getCompartment(view, ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createStateMachine_3075Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getStateMachine_3075OutgoingLinks(view));
-		Collection childNodeDescriptors = UMLDiagramUpdater.getStateMachine_3075SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-		createStateMachineInternalstructure_7053Children(getCompartment(view, StateMachineCompositeCompartmentEditPartCN.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createFunctionBehavior_3076Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getFunctionBehavior_3076OutgoingLinks(view));
-		Collection childNodeDescriptors = UMLDiagramUpdater.getFunctionBehavior_3076SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-		createFunctionBehaviorInternalstructure_7054Children(getCompartment(view, FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createOpaqueBehavior_3077Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getOpaqueBehavior_3077OutgoingLinks(view));
-		Collection childNodeDescriptors = UMLDiagramUpdater.getOpaqueBehavior_3077SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-		createOpaqueBehaviorInternalstructure_7055Children(getCompartment(view, OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createComponent_3081Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getComponent_3081OutgoingLinks(view));
-		Collection childNodeDescriptors = UMLDiagramUpdater.getComponent_3081SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-		createComponentInternalstructure_7056Children(getCompartment(view, ComponentCompositeCompartmentEditPartCN.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createDevice_3082Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getDevice_3082OutgoingLinks(view));
-		Collection childNodeDescriptors = UMLDiagramUpdater.getDevice_3082SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-		createDeviceInternalstructure_7057Children(getCompartment(view, DeviceCompositeCompartmentEditPartCN.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createExecutionEnvironment_3083Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getExecutionEnvironment_3083OutgoingLinks(view));
-		Collection childNodeDescriptors = UMLDiagramUpdater.getExecutionEnvironment_3083SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-		createExecutionEnvironmentInternalstructure_7058Children(getCompartment(view, ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createNode_3084Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getNode_3084OutgoingLinks(view));
-		Collection childNodeDescriptors = UMLDiagramUpdater.getNode_3084SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-		createNodeInternalstructure_7059Children(getCompartment(view, NodeCompositeCompartmentEditPartCN.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createClass_3085Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getClass_3085OutgoingLinks(view));
-		Collection childNodeDescriptors = UMLDiagramUpdater.getClass_3085SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-		createClassInternalstructure_7060Children(getCompartment(view, ClassCompositeCompartmentEditPartCN.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createCollaboration_3086Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getCollaboration_3086OutgoingLinks(view));
-		createCollaborationInternalstructure_7061Children(getCompartment(view, CollaborationCompositeCompartmentEditPartCN.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createInterface_3087Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getInterface_3087OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createPrimitiveType_3078Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getPrimitiveType_3078OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createEnumeration_3079Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getEnumeration_3079OutgoingLinks(view));
-		Collection childNodeDescriptors = UMLDiagramUpdater.getEnumeration_3079SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-		createEnumerationLiterals_7049Children(getCompartment(view, EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createDataType_3080Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getDataType_3080OutgoingLinks(view));
-		createDataTypeAttributes_7036Children(getCompartment(view, DataTypeAttributeCompartmentEditPartCN.VISUAL_ID));
-		createDataTypeOperations_7037Children(getCompartment(view, DataTypeOperationCompartmentEditPartCN.VISUAL_ID));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createActor_3091Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getActor_3091OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createDeploymentSpecification_3092Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getDeploymentSpecification_3092OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createArtifact_3093Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getArtifact_3093OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createInformationItem_3094Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getInformationItem_3094OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createSignal_3095Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getSignal_3095OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createUseCase_3096Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getUseCase_3096OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createComment_3097Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getComment_3097OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createDurationConstraint_3116Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getDurationConstraint_3116OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createTimeConstraint_3117Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getTimeConstraint_3117OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createIntervalConstraint_3118Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getIntervalConstraint_3118OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createInteractionConstraint_3119Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getInteractionConstraint_3119OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createConstraint_3120Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getConstraint_3120OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createProperty_3101Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getProperty_3101OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createOperation_3102Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getOperation_3102OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createEnumerationLiteral_3066Children(View view) {
-		myDomain2NotationMap.put(view.getElement(), view);
-		myLinkDescriptors.addAll(UMLDiagramUpdater.getEnumerationLiteral_3066OutgoingLinks(view));
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createDataTypeAttributes_7033Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getDataTypeAttributes_7033SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createDataTypeOperations_7034Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getDataTypeOperations_7034SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createDataTypeAttributes_7036Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getDataTypeAttributes_7036SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createDataTypeOperations_7037Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getDataTypeOperations_7037SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createEnumerationLiterals_7048Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getEnumerationLiterals_7048SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createEnumerationLiterals_7049Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getEnumerationLiterals_7049SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createActivityInternalstructure_7050Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getActivityInternalstructure_7050SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createInteractionInternalstructure_7051Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getInteractionInternalstructure_7051SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createProtocolStateMachineInternalstructure_7052Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getProtocolStateMachineInternalstructure_7052SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createStateMachineInternalstructure_7053Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getStateMachineInternalstructure_7053SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createFunctionBehaviorInternalstructure_7054Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getFunctionBehaviorInternalstructure_7054SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createOpaqueBehaviorInternalstructure_7055Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getOpaqueBehaviorInternalstructure_7055SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createComponentInternalstructure_7056Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getComponentInternalstructure_7056SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createDeviceInternalstructure_7057Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getDeviceInternalstructure_7057SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createExecutionEnvironmentInternalstructure_7058Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getExecutionEnvironmentInternalstructure_7058SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createNodeInternalstructure_7059Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getNodeInternalstructure_7059SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createClassInternalstructure_7060Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getClassInternalstructure_7060SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createCollaborationInternalstructure_7061Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getCollaborationInternalstructure_7061SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createActivityInternalstructure_7063Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getActivityInternalstructure_7063SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createInteractionInternalstructure_7064Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getInteractionInternalstructure_7064SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createProtocolStateMachineInternalstructure_7065Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getProtocolStateMachineInternalstructure_7065SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createStateMachineInternalstructure_7066Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getStateMachineInternalstructure_7066SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createFunctionBehaviorInternalstructure_7067Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getFunctionBehaviorInternalstructure_7067SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createOpaqueBehaviorInternalstructure_7068Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getOpaqueBehaviorInternalstructure_7068SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createComponentInternalstructure_7069Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getComponentInternalstructure_7069SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createDeviceInternalstructure_7070Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getDeviceInternalstructure_7070SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createExecutionEnvironmentInternalstructure_7071Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getExecutionEnvironmentInternalstructure_7071SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createNodeInternalstructure_7072Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getNodeInternalstructure_7072SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createClassInternalstructure_7073Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getClassInternalstructure_7073SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createCollaborationInternalstructure_7075Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getCollaborationInternalstructure_7075SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createPropertyInternalstructure_7077Children(View view) {
-		Collection childNodeDescriptors = UMLDiagramUpdater.getPropertyInternalstructure_7077SemanticChildren(view);
-		for (Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-			createNode(view, (UMLNodeDescriptor) it.next());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createNode(View parentView, UMLNodeDescriptor nodeDescriptor) {
-		final String nodeType = UMLVisualIDRegistry.getType(nodeDescriptor.getVisualID());
-		Node node = ViewService.createNode(parentView, nodeDescriptor.getModelElement(), nodeType, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
-		switch (nodeDescriptor.getVisualID()) {
-		case ActivityCompositeEditPart.VISUAL_ID:
-			createActivity_2060Children(node);
-			return;
-		case InteractionCompositeEditPart.VISUAL_ID:
-			createInteraction_2061Children(node);
-			return;
-		case ProtocolStateMachineCompositeEditPart.VISUAL_ID:
-			createProtocolStateMachine_2062Children(node);
-			return;
-		case StateMachineCompositeEditPart.VISUAL_ID:
-			createStateMachine_2063Children(node);
-			return;
-		case FunctionBehaviorCompositeEditPart.VISUAL_ID:
-			createFunctionBehavior_2064Children(node);
-			return;
-		case OpaqueBehaviorCompositeEditPart.VISUAL_ID:
-			createOpaqueBehavior_2065Children(node);
-			return;
-		case ComponentCompositeEditPart.VISUAL_ID:
-			createComponent_2069Children(node);
-			return;
-		case DeviceCompositeEditPart.VISUAL_ID:
-			createDevice_2070Children(node);
-			return;
-		case ExecutionEnvironmentCompositeEditPart.VISUAL_ID:
-			createExecutionEnvironment_2071Children(node);
-			return;
-		case NodeCompositeEditPart.VISUAL_ID:
-			createNode_2072Children(node);
-			return;
-		case ClassCompositeEditPart.VISUAL_ID:
-			createClass_2073Children(node);
-			return;
-		case CollaborationCompositeEditPart.VISUAL_ID:
-			createCollaboration_2075Children(node);
-			return;
-		case InterfaceEditPart.VISUAL_ID:
-			createInterface_2076Children(node);
-			return;
-		case PrimitiveTypeEditPart.VISUAL_ID:
-			createPrimitiveType_2066Children(node);
-			return;
-		case EnumerationEditPart.VISUAL_ID:
-			createEnumeration_2067Children(node);
-			return;
-		case DataTypeEditPart.VISUAL_ID:
-			createDataType_2068Children(node);
-			return;
-		case ActorEditPart.VISUAL_ID:
-			createActor_2077Children(node);
-			return;
-		case DeploymentSpecificationEditPart.VISUAL_ID:
-			createDeploymentSpecification_2078Children(node);
-			return;
-		case ArtifactEditPart.VISUAL_ID:
-			createArtifact_2079Children(node);
-			return;
-		case InformationItemEditPart.VISUAL_ID:
-			createInformationItem_2080Children(node);
-			return;
-		case SignalEditPart.VISUAL_ID:
-			createSignal_2081Children(node);
-			return;
-		case UseCaseEditPart.VISUAL_ID:
-			createUseCase_2082Children(node);
-			return;
-		case SignalEventEditPart.VISUAL_ID:
-			createSignalEvent_2083Children(node);
-			return;
-		case CallEventEditPart.VISUAL_ID:
-			createCallEvent_2084Children(node);
-			return;
-		case AnyReceiveEventEditPart.VISUAL_ID:
-			createAnyReceiveEvent_2085Children(node);
-			return;
-		case ChangeEventEditPart.VISUAL_ID:
-			createChangeEvent_2088Children(node);
-			return;
-		case TimeEventEditPart.VISUAL_ID:
-			createTimeEvent_2089Children(node);
-			return;
-		case DurationObservationEditPart.VISUAL_ID:
-			createDurationObservation_2093Children(node);
-			return;
-		case TimeObservationEditPart.VISUAL_ID:
-			createTimeObservation_2094Children(node);
-			return;
-		case LiteralBooleanEditPart.VISUAL_ID:
-			createLiteralBoolean_2095Children(node);
-			return;
-		case LiteralIntegerEditPart.VISUAL_ID:
-			createLiteralInteger_2096Children(node);
-			return;
-		case LiteralNullEditPart.VISUAL_ID:
-			createLiteralNull_2097Children(node);
-			return;
-		case LiteralStringEditPart.VISUAL_ID:
-			createLiteralString_2098Children(node);
-			return;
-		case LiteralUnlimitedNaturalEditPart.VISUAL_ID:
-			createLiteralUnlimitedNatural_2099Children(node);
-			return;
-		case StringExpressionEditPart.VISUAL_ID:
-			createStringExpression_2100Children(node);
-			return;
-		case OpaqueExpressionEditPart.VISUAL_ID:
-			createOpaqueExpression_2101Children(node);
-			return;
-		case TimeExpressionEditPart.VISUAL_ID:
-			createTimeExpression_2102Children(node);
-			return;
-		case ExpressionEditPart.VISUAL_ID:
-			createExpression_2103Children(node);
-			return;
-		case DurationEditPart.VISUAL_ID:
-			createDuration_2104Children(node);
-			return;
-		case TimeIntervalEditPart.VISUAL_ID:
-			createTimeInterval_2105Children(node);
-			return;
-		case DurationIntervalEditPart.VISUAL_ID:
-			createDurationInterval_2106Children(node);
-			return;
-		case IntervalEditPart.VISUAL_ID:
-			createInterval_2107Children(node);
-			return;
-		case InstanceValueEditPart.VISUAL_ID:
-			createInstanceValue_2108Children(node);
-			return;
-		case CommentEditPart.VISUAL_ID:
-			createComment_2109Children(node);
-			return;
-		case DurationConstraintEditPart.VISUAL_ID:
-			createDurationConstraint_2110Children(node);
-			return;
-		case TimeConstraintEditPart.VISUAL_ID:
-			createTimeConstraint_2111Children(node);
-			return;
-		case IntervalConstraintEditPart.VISUAL_ID:
-			createIntervalConstraint_2112Children(node);
-			return;
-		case InteractionConstraintEditPart.VISUAL_ID:
-			createInteractionConstraint_2113Children(node);
-			return;
-		case ConstraintEditPart.VISUAL_ID:
-			createConstraint_2114Children(node);
-			return;
-		case PortEditPart.VISUAL_ID:
-			createPort_3069Children(node);
-			return;
-		case ParameterEditPart.VISUAL_ID:
-			createParameter_3088Children(node);
-			return;
-		case PropertyPartEditPartCN.VISUAL_ID:
-			createProperty_3070Children(node);
-			return;
-		case CollaborationRoleEditPartCN.VISUAL_ID:
-			createConnectableElement_3115Children(node);
-			return;
-		case CollaborationUseEditPartCN.VISUAL_ID:
-			createCollaborationUse_3071Children(node);
-			return;
-		case ActivityCompositeEditPartCN.VISUAL_ID:
-			createActivity_3072Children(node);
-			return;
-		case InteractionCompositeEditPartCN.VISUAL_ID:
-			createInteraction_3073Children(node);
-			return;
-		case ProtocolStateMachineCompositeEditPartCN.VISUAL_ID:
-			createProtocolStateMachine_3074Children(node);
-			return;
-		case StateMachineCompositeEditPartCN.VISUAL_ID:
-			createStateMachine_3075Children(node);
-			return;
-		case FunctionBehaviorCompositeEditPartCN.VISUAL_ID:
-			createFunctionBehavior_3076Children(node);
-			return;
-		case OpaqueBehaviorCompositeEditPartCN.VISUAL_ID:
-			createOpaqueBehavior_3077Children(node);
-			return;
-		case ComponentCompositeEditPartCN.VISUAL_ID:
-			createComponent_3081Children(node);
-			return;
-		case DeviceCompositeEditPartCN.VISUAL_ID:
-			createDevice_3082Children(node);
-			return;
-		case ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID:
-			createExecutionEnvironment_3083Children(node);
-			return;
-		case NodeCompositeEditPartCN.VISUAL_ID:
-			createNode_3084Children(node);
-			return;
-		case ClassCompositeEditPartCN.VISUAL_ID:
-			createClass_3085Children(node);
-			return;
-		case CollaborationCompositeEditPartCN.VISUAL_ID:
-			createCollaboration_3086Children(node);
-			return;
-		case InterfaceEditPartCN.VISUAL_ID:
-			createInterface_3087Children(node);
-			return;
-		case PrimitiveTypeEditPartCN.VISUAL_ID:
-			createPrimitiveType_3078Children(node);
-			return;
-		case EnumerationEditPartCN.VISUAL_ID:
-			createEnumeration_3079Children(node);
-			return;
-		case DataTypeEditPartCN.VISUAL_ID:
-			createDataType_3080Children(node);
-			return;
-		case ActorEditPartCN.VISUAL_ID:
-			createActor_3091Children(node);
-			return;
-		case DeploymentSpecificationEditPartCN.VISUAL_ID:
-			createDeploymentSpecification_3092Children(node);
-			return;
-		case ArtifactEditPartCN.VISUAL_ID:
-			createArtifact_3093Children(node);
-			return;
-		case InformationItemEditPartCN.VISUAL_ID:
-			createInformationItem_3094Children(node);
-			return;
-		case SignalEditPartCN.VISUAL_ID:
-			createSignal_3095Children(node);
-			return;
-		case UseCaseEditPartCN.VISUAL_ID:
-			createUseCase_3096Children(node);
-			return;
-		case CommentEditPartCN.VISUAL_ID:
-			createComment_3097Children(node);
-			return;
-		case DurationConstraintEditPartCN.VISUAL_ID:
-			createDurationConstraint_3116Children(node);
-			return;
-		case TimeConstraintEditPartCN.VISUAL_ID:
-			createTimeConstraint_3117Children(node);
-			return;
-		case IntervalConstraintEditPartCN.VISUAL_ID:
-			createIntervalConstraint_3118Children(node);
-			return;
-		case InteractionConstraintEditPartCN.VISUAL_ID:
-			createInteractionConstraint_3119Children(node);
-			return;
-		case ConstraintEditPartCN.VISUAL_ID:
-			createConstraint_3120Children(node);
-			return;
-		case PropertyEditPartCLN.VISUAL_ID:
-			createProperty_3101Children(node);
-			return;
-		case OperationEditPartCLN.VISUAL_ID:
-			createOperation_3102Children(node);
-			return;
-		case EnumerationLiteralEditPartCLN.VISUAL_ID:
-			createEnumerationLiteral_3066Children(node);
-			return;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void createLinks(Diagram diagram) {
-		for (boolean continueLinkCreation = true; continueLinkCreation;) {
-			continueLinkCreation = false;
-			Collection additionalDescriptors = new LinkedList();
-			for (Iterator it = myLinkDescriptors.iterator(); it.hasNext();) {
-				UMLLinkDescriptor nextLinkDescriptor = (UMLLinkDescriptor) it.next();
-				if (!myDomain2NotationMap.containsKey(nextLinkDescriptor.getSource()) || !myDomain2NotationMap.containsKey(nextLinkDescriptor.getDestination())) {
-					continue;
-				}
-				final String linkType = UMLVisualIDRegistry.getType(nextLinkDescriptor.getVisualID());
-				Edge edge = ViewService.getInstance().createEdge(nextLinkDescriptor.getSemanticAdapter(), diagram, linkType, ViewUtil.APPEND, true, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
-				if (edge != null) {
-					edge.setSource((View) myDomain2NotationMap.get(nextLinkDescriptor.getSource()));
-					edge.setTarget((View) myDomain2NotationMap.get(nextLinkDescriptor.getDestination()));
-					it.remove();
-					if (nextLinkDescriptor.getModelElement() != null) {
-						myDomain2NotationMap.put(nextLinkDescriptor.getModelElement(), edge);
-					}
-					continueLinkCreation = true;
-					switch (nextLinkDescriptor.getVisualID()) {
-					case ComponentRealizationEditPart.VISUAL_ID:
-						additionalDescriptors.addAll(UMLDiagramUpdater.getComponentRealization_4004OutgoingLinks(edge));
-						break;
-					case InterfaceRealizationEditPart.VISUAL_ID:
-						additionalDescriptors.addAll(UMLDiagramUpdater.getInterfaceRealization_4005OutgoingLinks(edge));
-						break;
-					case SubstitutionEditPart.VISUAL_ID:
-						additionalDescriptors.addAll(UMLDiagramUpdater.getSubstitution_4011OutgoingLinks(edge));
-						break;
-					case RealizationEditPart.VISUAL_ID:
-						additionalDescriptors.addAll(UMLDiagramUpdater.getRealization_4006OutgoingLinks(edge));
-						break;
-					case ManifestationEditPart.VISUAL_ID:
-						additionalDescriptors.addAll(UMLDiagramUpdater.getManifestation_4012OutgoingLinks(edge));
-						break;
-					case AbstractionEditPart.VISUAL_ID:
-						additionalDescriptors.addAll(UMLDiagramUpdater.getAbstraction_4007OutgoingLinks(edge));
-						break;
-					case UsageEditPart.VISUAL_ID:
-						additionalDescriptors.addAll(UMLDiagramUpdater.getUsage_4008OutgoingLinks(edge));
-						break;
-					case DeploymentEditPart.VISUAL_ID:
-						additionalDescriptors.addAll(UMLDiagramUpdater.getDeployment_4009OutgoingLinks(edge));
-						break;
-					case RoleBindingEditPart.VISUAL_ID:
-						additionalDescriptors.addAll(UMLDiagramUpdater.getDependency_4017OutgoingLinks(edge));
-						break;
-					case DependencyEditPart.VISUAL_ID:
-						additionalDescriptors.addAll(UMLDiagramUpdater.getDependency_4010OutgoingLinks(edge));
-						break;
-					case ConnectorEditPart.VISUAL_ID:
-						additionalDescriptors.addAll(UMLDiagramUpdater.getConnector_4013OutgoingLinks(edge));
-						break;
-					case GeneralizationEditPart.VISUAL_ID:
-						additionalDescriptors.addAll(UMLDiagramUpdater.getGeneralization_4015OutgoingLinks(edge));
-						break;
-					case InformationFlowEditPart.VISUAL_ID:
-						additionalDescriptors.addAll(UMLDiagramUpdater.getInformationFlow_4021OutgoingLinks(edge));
-						break;
-					}
-				}
-			}
-			myLinkDescriptors.addAll(additionalDescriptors);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private Node getCompartment(View node, int visualID) {
-		String type = UMLVisualIDRegistry.getType(visualID);
-		for (Iterator it = node.getChildren().iterator(); it.hasNext();) {
-			View nextView = (View) it.next();
-			if (nextView instanceof Node && type.equals(nextView.getType())) {
-				return (Node) nextView;
-			}
-		}
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.part;

+

+import java.util.Collection;

+import java.util.HashMap;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.Map;

+

+import org.eclipse.gmf.runtime.diagram.core.services.ViewService;

+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.*;

+import org.eclipse.uml2.uml.Package;

+

+/**

+ * @generated

+ */

+public class UMLDiagramContentInitializer {

+

+	/**

+	 * @generated

+	 */

+	private Map myDomain2NotationMap = new HashMap();

+

+	/**

+	 * @generated

+	 */

+	private Collection myLinkDescriptors = new LinkedList();

+

+	/**

+	 * @generated

+	 */

+	public void initDiagramContent(Diagram diagram) {

+		if(!CompositeStructureDiagramEditPart.MODEL_ID.equals(diagram.getType())) {

+			UMLDiagramEditorPlugin.getInstance().logError("Incorrect diagram passed as a parameter: " + diagram.getType());

+			return;

+		}

+		if(false == diagram.getElement() instanceof Package) {

+			UMLDiagramEditorPlugin.getInstance().logError("Incorrect diagram element specified: " + diagram.getElement() + " instead of Package");

+			return;

+		}

+		createPackage_1000Children(diagram);

+		createLinks(diagram);

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createPackage_1000Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getPackage_1000SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createActivity_2060Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getActivity_2060OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getActivity_2060SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+		createActivityInternalstructure_7063Children(getCompartment(view, ActivityCompositeCompartmentEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createInteraction_2061Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInteraction_2061OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getInteraction_2061SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+		createInteractionInternalstructure_7064Children(getCompartment(view, InteractionCompositeCompartmentEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createProtocolStateMachine_2062Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProtocolStateMachine_2062OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getProtocolStateMachine_2062SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+		createProtocolStateMachineInternalstructure_7065Children(getCompartment(view, ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createStateMachine_2063Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getStateMachine_2063OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getStateMachine_2063SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+		createStateMachineInternalstructure_7066Children(getCompartment(view, StateMachineCompositeCompartmentEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createFunctionBehavior_2064Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getFunctionBehavior_2064OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getFunctionBehavior_2064SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+		createFunctionBehaviorInternalstructure_7067Children(getCompartment(view, FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createOpaqueBehavior_2065Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getOpaqueBehavior_2065OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getOpaqueBehavior_2065SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+		createOpaqueBehaviorInternalstructure_7068Children(getCompartment(view, OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createComponent_2069Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getComponent_2069OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getComponent_2069SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+		createComponentInternalstructure_7069Children(getCompartment(view, ComponentCompositeCompartmentEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createDevice_2070Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDevice_2070OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDevice_2070SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+		createDeviceInternalstructure_7070Children(getCompartment(view, DeviceCompositeCompartmentEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createExecutionEnvironment_2071Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getExecutionEnvironment_2071OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getExecutionEnvironment_2071SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+		createExecutionEnvironmentInternalstructure_7071Children(getCompartment(view, ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createNode_2072Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getNode_2072OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getNode_2072SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+		createNodeInternalstructure_7072Children(getCompartment(view, NodeCompositeCompartmentEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createClass_2073Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getClass_2073OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getClass_2073SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+		createClassInternalstructure_7073Children(getCompartment(view, ClassCompositeCompartmentEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createCollaboration_2075Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getCollaboration_2075OutgoingLinks(view));

+		createCollaborationInternalstructure_7075Children(getCompartment(view, CollaborationCompositeCompartmentEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createInterface_2076Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInterface_2076OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createPrimitiveType_2066Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getPrimitiveType_2066OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createEnumeration_2067Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getEnumeration_2067OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getEnumeration_2067SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+		createEnumerationLiterals_7048Children(getCompartment(view, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createDataType_2068Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDataType_2068OutgoingLinks(view));

+		createDataTypeAttributes_7033Children(getCompartment(view, DataTypeAttributeCompartmentEditPart.VISUAL_ID));

+		createDataTypeOperations_7034Children(getCompartment(view, DataTypeOperationCompartmentEditPart.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createActor_2077Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getActor_2077OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createDeploymentSpecification_2078Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDeploymentSpecification_2078OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createArtifact_2079Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getArtifact_2079OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createInformationItem_2080Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInformationItem_2080OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createSignal_2081Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getSignal_2081OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createUseCase_2082Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getUseCase_2082OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createSignalEvent_2083Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getSignalEvent_2083OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createCallEvent_2084Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getCallEvent_2084OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createAnyReceiveEvent_2085Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getAnyReceiveEvent_2085OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createChangeEvent_2088Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getChangeEvent_2088OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createTimeEvent_2089Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getTimeEvent_2089OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createDurationObservation_2093Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDurationObservation_2093OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createTimeObservation_2094Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getTimeObservation_2094OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createLiteralBoolean_2095Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getLiteralBoolean_2095OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createLiteralInteger_2096Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getLiteralInteger_2096OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createLiteralNull_2097Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getLiteralNull_2097OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createLiteralString_2098Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getLiteralString_2098OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createLiteralUnlimitedNatural_2099Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getLiteralUnlimitedNatural_2099OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createStringExpression_2100Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getStringExpression_2100OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createOpaqueExpression_2101Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getOpaqueExpression_2101OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createTimeExpression_2102Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getTimeExpression_2102OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createExpression_2103Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getExpression_2103OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createDuration_2104Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDuration_2104OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createTimeInterval_2105Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getTimeInterval_2105OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createDurationInterval_2106Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDurationInterval_2106OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createInterval_2107Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInterval_2107OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createInstanceValue_2108Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInstanceValue_2108OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createComment_2109Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getComment_2109OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createDurationConstraint_2110Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDurationConstraint_2110OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createTimeConstraint_2111Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getTimeConstraint_2111OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createIntervalConstraint_2112Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getIntervalConstraint_2112OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createInteractionConstraint_2113Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInteractionConstraint_2113OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createConstraint_2114Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getConstraint_2114OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createPort_3069Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getPort_3069OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createParameter_3088Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getParameter_3088OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createProperty_3070Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProperty_3070OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getProperty_3070SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+		createPropertyInternalstructure_7077Children(getCompartment(view, PropertyPartCompartmentEditPartCN.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createConnectableElement_3115Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getConnectableElement_3115OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createCollaborationUse_3071Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getCollaborationUse_3071OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createActivity_3072Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getActivity_3072OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getActivity_3072SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+		createActivityInternalstructure_7050Children(getCompartment(view, ActivityCompositeCompartmentEditPartCN.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createInteraction_3073Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInteraction_3073OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getInteraction_3073SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+		createInteractionInternalstructure_7051Children(getCompartment(view, InteractionCompositeCompartmentEditPartCN.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createProtocolStateMachine_3074Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProtocolStateMachine_3074OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getProtocolStateMachine_3074SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+		createProtocolStateMachineInternalstructure_7052Children(getCompartment(view, ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createStateMachine_3075Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getStateMachine_3075OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getStateMachine_3075SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+		createStateMachineInternalstructure_7053Children(getCompartment(view, StateMachineCompositeCompartmentEditPartCN.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createFunctionBehavior_3076Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getFunctionBehavior_3076OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getFunctionBehavior_3076SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+		createFunctionBehaviorInternalstructure_7054Children(getCompartment(view, FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createOpaqueBehavior_3077Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getOpaqueBehavior_3077OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getOpaqueBehavior_3077SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+		createOpaqueBehaviorInternalstructure_7055Children(getCompartment(view, OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createComponent_3081Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getComponent_3081OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getComponent_3081SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+		createComponentInternalstructure_7056Children(getCompartment(view, ComponentCompositeCompartmentEditPartCN.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createDevice_3082Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDevice_3082OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDevice_3082SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+		createDeviceInternalstructure_7057Children(getCompartment(view, DeviceCompositeCompartmentEditPartCN.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createExecutionEnvironment_3083Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getExecutionEnvironment_3083OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getExecutionEnvironment_3083SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+		createExecutionEnvironmentInternalstructure_7058Children(getCompartment(view, ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createNode_3084Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getNode_3084OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getNode_3084SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+		createNodeInternalstructure_7059Children(getCompartment(view, NodeCompositeCompartmentEditPartCN.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createClass_3085Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getClass_3085OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getClass_3085SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+		createClassInternalstructure_7060Children(getCompartment(view, ClassCompositeCompartmentEditPartCN.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createCollaboration_3086Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getCollaboration_3086OutgoingLinks(view));

+		createCollaborationInternalstructure_7061Children(getCompartment(view, CollaborationCompositeCompartmentEditPartCN.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createInterface_3087Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInterface_3087OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createPrimitiveType_3078Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getPrimitiveType_3078OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createEnumeration_3079Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getEnumeration_3079OutgoingLinks(view));

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getEnumeration_3079SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+		createEnumerationLiterals_7049Children(getCompartment(view, EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createDataType_3080Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDataType_3080OutgoingLinks(view));

+		createDataTypeAttributes_7036Children(getCompartment(view, DataTypeAttributeCompartmentEditPartCN.VISUAL_ID));

+		createDataTypeOperations_7037Children(getCompartment(view, DataTypeOperationCompartmentEditPartCN.VISUAL_ID));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createActor_3091Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getActor_3091OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createDeploymentSpecification_3092Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDeploymentSpecification_3092OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createArtifact_3093Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getArtifact_3093OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createInformationItem_3094Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInformationItem_3094OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createSignal_3095Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getSignal_3095OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createUseCase_3096Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getUseCase_3096OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createComment_3097Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getComment_3097OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createDurationConstraint_3116Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDurationConstraint_3116OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createTimeConstraint_3117Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getTimeConstraint_3117OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createIntervalConstraint_3118Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getIntervalConstraint_3118OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createInteractionConstraint_3119Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInteractionConstraint_3119OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createConstraint_3120Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getConstraint_3120OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createProperty_3101Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getProperty_3101OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createOperation_3102Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getOperation_3102OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createEnumerationLiteral_3066Children(View view) {

+		myDomain2NotationMap.put(view.getElement(), view);

+		myLinkDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getEnumerationLiteral_3066OutgoingLinks(view));

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createDataTypeAttributes_7033Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDataTypeAttributes_7033SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createDataTypeOperations_7034Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDataTypeOperations_7034SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createDataTypeAttributes_7036Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDataTypeAttributes_7036SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createDataTypeOperations_7037Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDataTypeOperations_7037SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createEnumerationLiterals_7048Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getEnumerationLiterals_7048SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createEnumerationLiterals_7049Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getEnumerationLiterals_7049SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createActivityInternalstructure_7050Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getActivityInternalstructure_7050SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createInteractionInternalstructure_7051Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getInteractionInternalstructure_7051SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createProtocolStateMachineInternalstructure_7052Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getProtocolStateMachineInternalstructure_7052SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createStateMachineInternalstructure_7053Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getStateMachineInternalstructure_7053SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createFunctionBehaviorInternalstructure_7054Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getFunctionBehaviorInternalstructure_7054SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createOpaqueBehaviorInternalstructure_7055Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getOpaqueBehaviorInternalstructure_7055SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createComponentInternalstructure_7056Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getComponentInternalstructure_7056SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createDeviceInternalstructure_7057Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDeviceInternalstructure_7057SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createExecutionEnvironmentInternalstructure_7058Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getExecutionEnvironmentInternalstructure_7058SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createNodeInternalstructure_7059Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getNodeInternalstructure_7059SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createClassInternalstructure_7060Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getClassInternalstructure_7060SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createCollaborationInternalstructure_7061Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getCollaborationInternalstructure_7061SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createActivityInternalstructure_7063Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getActivityInternalstructure_7063SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createInteractionInternalstructure_7064Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getInteractionInternalstructure_7064SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createProtocolStateMachineInternalstructure_7065Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getProtocolStateMachineInternalstructure_7065SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createStateMachineInternalstructure_7066Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getStateMachineInternalstructure_7066SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createFunctionBehaviorInternalstructure_7067Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getFunctionBehaviorInternalstructure_7067SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createOpaqueBehaviorInternalstructure_7068Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getOpaqueBehaviorInternalstructure_7068SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createComponentInternalstructure_7069Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getComponentInternalstructure_7069SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createDeviceInternalstructure_7070Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getDeviceInternalstructure_7070SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createExecutionEnvironmentInternalstructure_7071Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getExecutionEnvironmentInternalstructure_7071SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createNodeInternalstructure_7072Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getNodeInternalstructure_7072SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createClassInternalstructure_7073Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getClassInternalstructure_7073SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createCollaborationInternalstructure_7075Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getCollaborationInternalstructure_7075SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createPropertyInternalstructure_7077Children(View view) {

+		Collection childNodeDescriptors = UMLDiagramUpdater.INSTANCE.getPropertyInternalstructure_7077SemanticChildren(view);

+		for(Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {

+			createNode(view, (UMLNodeDescriptor)it.next());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createNode(View parentView, UMLNodeDescriptor nodeDescriptor) {

+		final String nodeType = UMLVisualIDRegistry.getType(nodeDescriptor.getVisualID());

+		Node node = ViewService.createNode(parentView, nodeDescriptor.getModelElement(), nodeType, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

+		switch(nodeDescriptor.getVisualID()) {

+		case ActivityCompositeEditPart.VISUAL_ID:

+			createActivity_2060Children(node);

+			return;

+		case InteractionCompositeEditPart.VISUAL_ID:

+			createInteraction_2061Children(node);

+			return;

+		case ProtocolStateMachineCompositeEditPart.VISUAL_ID:

+			createProtocolStateMachine_2062Children(node);

+			return;

+		case StateMachineCompositeEditPart.VISUAL_ID:

+			createStateMachine_2063Children(node);

+			return;

+		case FunctionBehaviorCompositeEditPart.VISUAL_ID:

+			createFunctionBehavior_2064Children(node);

+			return;

+		case OpaqueBehaviorCompositeEditPart.VISUAL_ID:

+			createOpaqueBehavior_2065Children(node);

+			return;

+		case ComponentCompositeEditPart.VISUAL_ID:

+			createComponent_2069Children(node);

+			return;

+		case DeviceCompositeEditPart.VISUAL_ID:

+			createDevice_2070Children(node);

+			return;

+		case ExecutionEnvironmentCompositeEditPart.VISUAL_ID:

+			createExecutionEnvironment_2071Children(node);

+			return;

+		case NodeCompositeEditPart.VISUAL_ID:

+			createNode_2072Children(node);

+			return;

+		case ClassCompositeEditPart.VISUAL_ID:

+			createClass_2073Children(node);

+			return;

+		case CollaborationCompositeEditPart.VISUAL_ID:

+			createCollaboration_2075Children(node);

+			return;

+		case InterfaceEditPart.VISUAL_ID:

+			createInterface_2076Children(node);

+			return;

+		case PrimitiveTypeEditPart.VISUAL_ID:

+			createPrimitiveType_2066Children(node);

+			return;

+		case EnumerationEditPart.VISUAL_ID:

+			createEnumeration_2067Children(node);

+			return;

+		case DataTypeEditPart.VISUAL_ID:

+			createDataType_2068Children(node);

+			return;

+		case ActorEditPart.VISUAL_ID:

+			createActor_2077Children(node);

+			return;

+		case DeploymentSpecificationEditPart.VISUAL_ID:

+			createDeploymentSpecification_2078Children(node);

+			return;

+		case ArtifactEditPart.VISUAL_ID:

+			createArtifact_2079Children(node);

+			return;

+		case InformationItemEditPart.VISUAL_ID:

+			createInformationItem_2080Children(node);

+			return;

+		case SignalEditPart.VISUAL_ID:

+			createSignal_2081Children(node);

+			return;

+		case UseCaseEditPart.VISUAL_ID:

+			createUseCase_2082Children(node);

+			return;

+		case SignalEventEditPart.VISUAL_ID:

+			createSignalEvent_2083Children(node);

+			return;

+		case CallEventEditPart.VISUAL_ID:

+			createCallEvent_2084Children(node);

+			return;

+		case AnyReceiveEventEditPart.VISUAL_ID:

+			createAnyReceiveEvent_2085Children(node);

+			return;

+		case ChangeEventEditPart.VISUAL_ID:

+			createChangeEvent_2088Children(node);

+			return;

+		case TimeEventEditPart.VISUAL_ID:

+			createTimeEvent_2089Children(node);

+			return;

+		case DurationObservationEditPart.VISUAL_ID:

+			createDurationObservation_2093Children(node);

+			return;

+		case TimeObservationEditPart.VISUAL_ID:

+			createTimeObservation_2094Children(node);

+			return;

+		case LiteralBooleanEditPart.VISUAL_ID:

+			createLiteralBoolean_2095Children(node);

+			return;

+		case LiteralIntegerEditPart.VISUAL_ID:

+			createLiteralInteger_2096Children(node);

+			return;

+		case LiteralNullEditPart.VISUAL_ID:

+			createLiteralNull_2097Children(node);

+			return;

+		case LiteralStringEditPart.VISUAL_ID:

+			createLiteralString_2098Children(node);

+			return;

+		case LiteralUnlimitedNaturalEditPart.VISUAL_ID:

+			createLiteralUnlimitedNatural_2099Children(node);

+			return;

+		case StringExpressionEditPart.VISUAL_ID:

+			createStringExpression_2100Children(node);

+			return;

+		case OpaqueExpressionEditPart.VISUAL_ID:

+			createOpaqueExpression_2101Children(node);

+			return;

+		case TimeExpressionEditPart.VISUAL_ID:

+			createTimeExpression_2102Children(node);

+			return;

+		case ExpressionEditPart.VISUAL_ID:

+			createExpression_2103Children(node);

+			return;

+		case DurationEditPart.VISUAL_ID:

+			createDuration_2104Children(node);

+			return;

+		case TimeIntervalEditPart.VISUAL_ID:

+			createTimeInterval_2105Children(node);

+			return;

+		case DurationIntervalEditPart.VISUAL_ID:

+			createDurationInterval_2106Children(node);

+			return;

+		case IntervalEditPart.VISUAL_ID:

+			createInterval_2107Children(node);

+			return;

+		case InstanceValueEditPart.VISUAL_ID:

+			createInstanceValue_2108Children(node);

+			return;

+		case CommentEditPart.VISUAL_ID:

+			createComment_2109Children(node);

+			return;

+		case DurationConstraintEditPart.VISUAL_ID:

+			createDurationConstraint_2110Children(node);

+			return;

+		case TimeConstraintEditPart.VISUAL_ID:

+			createTimeConstraint_2111Children(node);

+			return;

+		case IntervalConstraintEditPart.VISUAL_ID:

+			createIntervalConstraint_2112Children(node);

+			return;

+		case InteractionConstraintEditPart.VISUAL_ID:

+			createInteractionConstraint_2113Children(node);

+			return;

+		case ConstraintEditPart.VISUAL_ID:

+			createConstraint_2114Children(node);

+			return;

+		case PortEditPart.VISUAL_ID:

+			createPort_3069Children(node);

+			return;

+		case ParameterEditPart.VISUAL_ID:

+			createParameter_3088Children(node);

+			return;

+		case PropertyPartEditPartCN.VISUAL_ID:

+			createProperty_3070Children(node);

+			return;

+		case CollaborationRoleEditPartCN.VISUAL_ID:

+			createConnectableElement_3115Children(node);

+			return;

+		case CollaborationUseEditPartCN.VISUAL_ID:

+			createCollaborationUse_3071Children(node);

+			return;

+		case ActivityCompositeEditPartCN.VISUAL_ID:

+			createActivity_3072Children(node);

+			return;

+		case InteractionCompositeEditPartCN.VISUAL_ID:

+			createInteraction_3073Children(node);

+			return;

+		case ProtocolStateMachineCompositeEditPartCN.VISUAL_ID:

+			createProtocolStateMachine_3074Children(node);

+			return;

+		case StateMachineCompositeEditPartCN.VISUAL_ID:

+			createStateMachine_3075Children(node);

+			return;

+		case FunctionBehaviorCompositeEditPartCN.VISUAL_ID:

+			createFunctionBehavior_3076Children(node);

+			return;

+		case OpaqueBehaviorCompositeEditPartCN.VISUAL_ID:

+			createOpaqueBehavior_3077Children(node);

+			return;

+		case ComponentCompositeEditPartCN.VISUAL_ID:

+			createComponent_3081Children(node);

+			return;

+		case DeviceCompositeEditPartCN.VISUAL_ID:

+			createDevice_3082Children(node);

+			return;

+		case ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID:

+			createExecutionEnvironment_3083Children(node);

+			return;

+		case NodeCompositeEditPartCN.VISUAL_ID:

+			createNode_3084Children(node);

+			return;

+		case ClassCompositeEditPartCN.VISUAL_ID:

+			createClass_3085Children(node);

+			return;

+		case CollaborationCompositeEditPartCN.VISUAL_ID:

+			createCollaboration_3086Children(node);

+			return;

+		case InterfaceEditPartCN.VISUAL_ID:

+			createInterface_3087Children(node);

+			return;

+		case PrimitiveTypeEditPartCN.VISUAL_ID:

+			createPrimitiveType_3078Children(node);

+			return;

+		case EnumerationEditPartCN.VISUAL_ID:

+			createEnumeration_3079Children(node);

+			return;

+		case DataTypeEditPartCN.VISUAL_ID:

+			createDataType_3080Children(node);

+			return;

+		case ActorEditPartCN.VISUAL_ID:

+			createActor_3091Children(node);

+			return;

+		case DeploymentSpecificationEditPartCN.VISUAL_ID:

+			createDeploymentSpecification_3092Children(node);

+			return;

+		case ArtifactEditPartCN.VISUAL_ID:

+			createArtifact_3093Children(node);

+			return;

+		case InformationItemEditPartCN.VISUAL_ID:

+			createInformationItem_3094Children(node);

+			return;

+		case SignalEditPartCN.VISUAL_ID:

+			createSignal_3095Children(node);

+			return;

+		case UseCaseEditPartCN.VISUAL_ID:

+			createUseCase_3096Children(node);

+			return;

+		case CommentEditPartCN.VISUAL_ID:

+			createComment_3097Children(node);

+			return;

+		case DurationConstraintEditPartCN.VISUAL_ID:

+			createDurationConstraint_3116Children(node);

+			return;

+		case TimeConstraintEditPartCN.VISUAL_ID:

+			createTimeConstraint_3117Children(node);

+			return;

+		case IntervalConstraintEditPartCN.VISUAL_ID:

+			createIntervalConstraint_3118Children(node);

+			return;

+		case InteractionConstraintEditPartCN.VISUAL_ID:

+			createInteractionConstraint_3119Children(node);

+			return;

+		case ConstraintEditPartCN.VISUAL_ID:

+			createConstraint_3120Children(node);

+			return;

+		case PropertyEditPartCLN.VISUAL_ID:

+			createProperty_3101Children(node);

+			return;

+		case OperationEditPartCLN.VISUAL_ID:

+			createOperation_3102Children(node);

+			return;

+		case EnumerationLiteralEditPartCLN.VISUAL_ID:

+			createEnumerationLiteral_3066Children(node);

+			return;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void createLinks(Diagram diagram) {

+		for(boolean continueLinkCreation = true; continueLinkCreation;) {

+			continueLinkCreation = false;

+			Collection additionalDescriptors = new LinkedList();

+			for(Iterator it = myLinkDescriptors.iterator(); it.hasNext();) {

+				UMLLinkDescriptor nextLinkDescriptor = (UMLLinkDescriptor)it.next();

+				if(!myDomain2NotationMap.containsKey(nextLinkDescriptor.getSource()) || !myDomain2NotationMap.containsKey(nextLinkDescriptor.getDestination())) {

+					continue;

+				}

+				final String linkType = UMLVisualIDRegistry.getType(nextLinkDescriptor.getVisualID());

+				Edge edge = ViewService.getInstance().createEdge(nextLinkDescriptor.getSemanticAdapter(), diagram, linkType, ViewUtil.APPEND, true, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

+				if(edge != null) {

+					edge.setSource((View)myDomain2NotationMap.get(nextLinkDescriptor.getSource()));

+					edge.setTarget((View)myDomain2NotationMap.get(nextLinkDescriptor.getDestination()));

+					it.remove();

+					if(nextLinkDescriptor.getModelElement() != null) {

+						myDomain2NotationMap.put(nextLinkDescriptor.getModelElement(), edge);

+					}

+					continueLinkCreation = true;

+					switch(nextLinkDescriptor.getVisualID()) {

+					case ComponentRealizationEditPart.VISUAL_ID:

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getComponentRealization_4004OutgoingLinks(edge));

+						break;

+					case InterfaceRealizationEditPart.VISUAL_ID:

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInterfaceRealization_4005OutgoingLinks(edge));

+						break;

+					case SubstitutionEditPart.VISUAL_ID:

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getSubstitution_4011OutgoingLinks(edge));

+						break;

+					case RealizationEditPart.VISUAL_ID:

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getRealization_4006OutgoingLinks(edge));

+						break;

+					case ManifestationEditPart.VISUAL_ID:

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getManifestation_4012OutgoingLinks(edge));

+						break;

+					case AbstractionEditPart.VISUAL_ID:

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getAbstraction_4007OutgoingLinks(edge));

+						break;

+					case UsageEditPart.VISUAL_ID:

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getUsage_4008OutgoingLinks(edge));

+						break;

+					case DeploymentEditPart.VISUAL_ID:

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDeployment_4009OutgoingLinks(edge));

+						break;

+					case RoleBindingEditPart.VISUAL_ID:

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDependency_4017OutgoingLinks(edge));

+						break;

+					case DependencyEditPart.VISUAL_ID:

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getDependency_4010OutgoingLinks(edge));

+						break;

+					case ConnectorEditPart.VISUAL_ID:

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getConnector_4013OutgoingLinks(edge));

+						break;

+					case GeneralizationEditPart.VISUAL_ID:

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getGeneralization_4015OutgoingLinks(edge));

+						break;

+					case InformationFlowEditPart.VISUAL_ID:

+						additionalDescriptors.addAll(UMLDiagramUpdater.INSTANCE.getInformationFlow_4021OutgoingLinks(edge));

+						break;

+					}

+				}

+			}

+			myLinkDescriptors.addAll(additionalDescriptors);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private Node getCompartment(View node, int visualID) {

+		String type = UMLVisualIDRegistry.getType(visualID);

+		for(Iterator it = node.getChildren().iterator(); it.hasNext();) {

+			View nextView = (View)it.next();

+			if(nextView instanceof Node && type.equals(nextView.getType())) {

+				return (Node)nextView;

+			}

+		}

+		return null;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditor.java
index 9adfd5b306b..bf1fe6f5fa3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditor.java
@@ -1,481 +1,518 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.part;
-
-import java.util.EventObject;
-
-import org.eclipse.core.commands.operations.IUndoContext;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.KeyHandler;
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.commands.CommandStackListener;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.ui.palette.PaletteViewer;
-import org.eclipse.gef.ui.palette.PaletteViewerProvider;
-import org.eclipse.gmf.runtime.common.core.service.IProviderChangeListener;
-import org.eclipse.gmf.runtime.common.core.service.ProviderChangeEvent;
-import org.eclipse.gmf.runtime.common.ui.services.marker.MarkerNavigationService;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
-import org.eclipse.gmf.runtime.diagram.ui.internal.parts.PaletteToolTransferDragSourceListener;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocumentProvider;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.util.LocalSelectionTransfer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.papyrus.commands.util.OperationHistoryDirtyState;
-import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
-import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.infra.gmfdiag.common.GmfMultiDiagramDocumentProvider;
-import org.eclipse.papyrus.uml.diagram.common.listeners.DropTargetListener;
-import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteContextMenuProvider;
-import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteViewer;
-import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;
-import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.ide.IGotoMarker;
-import org.eclipse.ui.part.ShowInContext;
-
-/**
- * @generated
- */
-public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderChangeListener
-		,
-		IGotoMarker
-{
-	/**
-	 * @generated
-	 */
-	public static final String ID = "org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorID"; //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final String CONTEXT_ID = "org.eclipse.papyrus.uml.diagram.composite.ui.diagramContext"; //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private KeyHandler paletteKeyHandler = null;
-	/**
-	 * @generated
-	 */
-	private MouseListener paletteMouseListener = null;
-	/**
-	 * @generated
-	 */
-	private OperationHistoryDirtyState dirtyState;
-	/**
-	 * @generated
-	 */
-	private TransactionalEditingDomain editingDomain;
-	/**
-	 * @generated
-	 */
-	private IDocumentProvider documentProvider;
-
-	/**
-	 * @generated
-	 */
-	public UMLDiagramEditor(ServicesRegistry servicesRegistry, Diagram diagram) throws ServiceException {
-		super(servicesRegistry, diagram);
-		// adds a listener to the palette service, which reacts to palette customizations
-		PapyrusPaletteService.getInstance().addProviderChangeListener(this);
-		// Share the same editing provider
-		editingDomain = servicesRegistry.getService(TransactionalEditingDomain.class);
-		documentProvider = new GmfMultiDiagramDocumentProvider(editingDomain);
-		// overrides editing domain created by super constructor
-		setDocumentProvider(documentProvider);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getContextID() {
-		return CONTEXT_ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected PaletteRoot createPaletteRoot(PaletteRoot existingPaletteRoot) {
-		PaletteRoot paletteRoot;
-		if (existingPaletteRoot == null) {
-			paletteRoot = PapyrusPaletteService.getInstance().createPalette(this, getDefaultPaletteContent());
-		} else {
-			PapyrusPaletteService.getInstance().updatePalette(existingPaletteRoot, this, getDefaultPaletteContent());
-			paletteRoot = existingPaletteRoot;
-		}
-		applyCustomizationsToPalette(paletteRoot);
-		return paletteRoot;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected PreferencesHint getPreferencesHint() {
-		return UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT;
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getContributorId() {
-		return UMLDiagramEditorPlugin.ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected final IDocumentProvider getDocumentProvider(IEditorInput input) {
-		return documentProvider;
-	}
-
-	/**
-	 * @generated
-	 */
-	public TransactionalEditingDomain getEditingDomain() {
-		return editingDomain;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected final void setDocumentProvider(IEditorInput input) {
-		// Already set in the constructor
-	}
-
-	/**
-	 * @generated
-	 */
-	public void gotoMarker(IMarker marker) {
-		MarkerNavigationService.getInstance().gotoMarker(this, marker);
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean isSaveAsAllowed() {
-		return true;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void doSaveAs() {
-		performSaveAs(new NullProgressMonitor());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void performSaveAs(IProgressMonitor progressMonitor) {
-		// Nothing
-	}
-
-	/**
-	 * @generated
-	 */
-	public ShowInContext getShowInContext() {
-		return new ShowInContext(getEditorInput(), getGraphicalViewer().getSelection());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void configureGraphicalViewer() {
-		super.configureGraphicalViewer();
-		DiagramEditorContextMenuProvider provider =
-				new DiagramEditorContextMenuProvider(this, getDiagramGraphicalViewer());
-		getDiagramGraphicalViewer().setContextMenu(provider);
-		getSite().registerContextMenu(ActionIds.DIAGRAM_EDITOR_CONTEXT_MENU, provider, getDiagramGraphicalViewer());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected TransactionalEditingDomain createEditingDomain() {
-		// Already configured
-		return editingDomain;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void configureDiagramEditDomain() {
-		super.configureDiagramEditDomain();
-		getDiagramEditDomain().getDiagramCommandStack().addCommandStackListener(new CommandStackListener() {
-			public void commandStackChanged(EventObject event) {
-				firePropertyChange(IEditorPart.PROP_DIRTY);
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	public void doSave(IProgressMonitor progressMonitor) {
-		// The saving of the resource is done by the CoreMultiDiagramEditor
-		getDirtyState().saved();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected OperationHistoryDirtyState getDirtyState() {
-		if (dirtyState == null) {
-			dirtyState = OperationHistoryDirtyState.newInstance(getUndoContext(), getOperationHistory());
-		}
-		return dirtyState;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setUndoContext(IUndoContext context) {
-		if (dirtyState != null) {
-			dirtyState.dispose();
-			dirtyState = null;
-		}
-		super.setUndoContext(context);
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean isDirty() {
-		return getDirtyState().isDirty();
-	}
-
-	/**
-	 * @generated
-	 */
-	public void providerChanged(ProviderChangeEvent event) {
-		// update the palette if the palette service has changed
-		if (PapyrusPaletteService.getInstance().equals(event.getSource())) {
-			PapyrusPaletteService.getInstance().updatePalette(getPaletteViewer().getPaletteRoot(), this,
-					getDefaultPaletteContent());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void dispose() {
-		// remove palette service listener
-		// remove preference listener
-		PapyrusPaletteService.getInstance().removeProviderChangeListener(this);
-		if (dirtyState != null) {
-			dirtyState.dispose();
-			dirtyState = null;
-		}
-		super.dispose();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected PaletteViewer getPaletteViewer() {
-		return getEditDomain().getPaletteViewer();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected PaletteViewer constructPaletteViewer() {
-		return new PapyrusPaletteViewer();
-	}
-
-	/**
-	 * @generated
-	 */
-	protected PaletteViewerProvider createPaletteViewerProvider() {
-		getEditDomain().setPaletteRoot(createPaletteRoot(null));
-		return new PaletteViewerProvider(getEditDomain()) {
-			/**
-			 * Override to provide the additional behavior for the tools. Will intialize with a
-			 * PaletteEditPartFactory that has a TrackDragger that understand how to handle the
-			 * mouseDoubleClick event for shape creation tools. Also will initialize the palette
-			 * with a defaultTool that is the SelectToolEx that undestands how to handle the enter
-			 * key which will result in the creation of the shape also.
-			 */
-			protected void configurePaletteViewer(PaletteViewer viewer) {
-				super.configurePaletteViewer(viewer);
-				// customize menu...
-				viewer.setContextMenu(new PapyrusPaletteContextMenuProvider(viewer));
-				viewer.getKeyHandler().setParent(getPaletteKeyHandler());
-				viewer.getControl().addMouseListener(getPaletteMouseListener());
-				// Add a transfer drag target listener that is supported on
-				// palette template entries whose template is a creation tool.
-				// This will enable drag and drop of the palette shape creation
-				// tools.
-				viewer.addDragSourceListener(new PaletteToolTransferDragSourceListener(viewer));
-				viewer.setCustomizer(createPaletteCustomizer());
-			}
-
-			public PaletteViewer createPaletteViewer(Composite parent) {
-				PaletteViewer pViewer = constructPaletteViewer();
-				pViewer.createControl(parent);
-				configurePaletteViewer(pViewer);
-				hookPaletteViewer(pViewer);
-				return pViewer;
-			}
-
-			/**
-			 * @return Palette Key Handler for the palette
-			 */
-			private KeyHandler getPaletteKeyHandler() {
-				if (paletteKeyHandler == null) {
-					paletteKeyHandler = new KeyHandler() {
-						/**
-						 * Processes a <i>key released </i> event. This method is called by the Tool
-						 * whenever a key is released, and the Tool is in the proper state. Override
-						 * to support pressing the enter key to create a shape or connection
-						 * (between two selected shapes)
-						 * 
-						 * @param event
-						 *            the KeyEvent
-						 * @return <code>true</code> if KeyEvent was handled in some way
-						 */
-						public boolean keyReleased(KeyEvent event) {
-							if (event.keyCode == SWT.Selection) {
-								Tool tool = getPaletteViewer().getActiveTool().createTool();
-								if (toolSupportsAccessibility(tool)) {
-									tool.keyUp(event, getDiagramGraphicalViewer());
-									// deactivate current selection
-									getPaletteViewer().setActiveTool(null);
-									return true;
-								}
-							}
-							return super.keyReleased(event);
-						}
-					};
-				}
-				return paletteKeyHandler;
-			}
-
-			/**
-			 * @return Palette Mouse listener for the palette
-			 */
-			private MouseListener getPaletteMouseListener() {
-				if (paletteMouseListener == null) {
-					paletteMouseListener = new MouseListener() {
-						/**
-						 * Flag to indicate that the current active tool should be cleared after a
-						 * mouse double-click event.
-						 */
-						private boolean clearActiveTool = false;
-
-						/**
-						 * Override to support double-clicking a palette tool entry to create a
-						 * shape or connection (between two selected shapes).
-						 * 
-						 * @see MouseListener#mouseDoubleClick(MouseEvent)
-						 */
-						public void mouseDoubleClick(MouseEvent e) {
-							Tool tool = getPaletteViewer().getActiveTool().createTool();
-							if (toolSupportsAccessibility(tool)) {
-								tool.setViewer(getDiagramGraphicalViewer());
-								tool.setEditDomain(getDiagramGraphicalViewer().getEditDomain());
-								tool.mouseDoubleClick(e, getDiagramGraphicalViewer());
-								// Current active tool should be deactivated,
-								// but if it is down here it will get
-								// reactivated deep in GEF palette code after
-								// receiving mouse up events.
-								clearActiveTool = true;
-							}
-						}
-
-						public void mouseDown(MouseEvent e) {
-							// do nothing
-						}
-
-						public void mouseUp(MouseEvent e) {
-							// Deactivate current active tool here if a
-							// double-click was handled.
-							if (clearActiveTool) {
-								getPaletteViewer().setActiveTool(null);
-								clearActiveTool = false;
-							}
-						}
-					};
-				}
-				return paletteMouseListener;
-			}
-		};
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public GraphicalViewer getGraphicalViewer() {
-		return super.getGraphicalViewer();
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	protected void initializeGraphicalViewer() {
-		super.initializeGraphicalViewer();
-		// Enable Drop
-		getDiagramGraphicalViewer().addDropTargetListener(
-				new DropTargetListener(getDiagramGraphicalViewer(), LocalSelectionTransfer.getTransfer()) {
-					@Override
-					protected Object getJavaObject(TransferData data) {
-						// It is usual for the transfer data not to be set because it is available locally
-						return LocalSelectionTransfer.getTransfer().getSelection();
-					}
-
-					@Override
-					protected TransactionalEditingDomain getTransactionalEditingDomain() {
-						return getEditingDomain();
-					}
-				});
-	}
-
-	/**
-	 * @generated
-	 */
-	@Override
-	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-		if (getSite().getPage().getActiveEditor() instanceof IMultiDiagramEditor) {
-			IMultiDiagramEditor editor = (IMultiDiagramEditor) getSite().getPage().getActiveEditor();
-			// If not the active editor, ignore selection changed.
-			if (this.equals(editor.getActiveEditor())) {
-				updateActions(getSelectionActions());
-				super.selectionChanged(part, selection);
-			} else {
-				super.selectionChanged(part, selection);
-			}
-		} else {
-			super.selectionChanged(part, selection);
-		}
-		// from
-		// org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor.selectionChanged(IWorkbenchPart,
-		// ISelection)
-		if (part == this) {
-			rebuildStatusLine();
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.part;

+

+import java.util.EventObject;

+

+import org.eclipse.core.commands.operations.IUndoContext;

+import org.eclipse.core.resources.IMarker;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.core.runtime.NullProgressMonitor;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.GraphicalViewer;

+import org.eclipse.gef.KeyHandler;

+import org.eclipse.gef.Tool;

+import org.eclipse.gef.commands.CommandStackListener;

+import org.eclipse.gef.palette.PaletteRoot;

+import org.eclipse.gef.ui.palette.PaletteViewer;

+import org.eclipse.gef.ui.palette.PaletteViewerProvider;

+import org.eclipse.gmf.runtime.common.core.service.IProviderChangeListener;

+import org.eclipse.gmf.runtime.common.core.service.ProviderChangeEvent;

+import org.eclipse.gmf.runtime.common.ui.services.marker.MarkerNavigationService;

+import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

+import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;

+import org.eclipse.gmf.runtime.diagram.ui.internal.parts.PaletteToolTransferDragSourceListener;

+import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocumentProvider;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.jface.util.LocalSelectionTransfer;

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.papyrus.commands.util.OperationHistoryDirtyState;

+import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;

+import org.eclipse.papyrus.infra.core.services.ServiceException;

+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

+import org.eclipse.papyrus.infra.gmfdiag.common.GmfMultiDiagramDocumentProvider;

+import org.eclipse.papyrus.uml.diagram.common.listeners.DropTargetListener;

+import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteContextMenuProvider;

+import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteViewer;

+import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;

+import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.dnd.TransferData;

+import org.eclipse.swt.events.KeyEvent;

+import org.eclipse.swt.events.MouseEvent;

+import org.eclipse.swt.events.MouseListener;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.ui.IEditorInput;

+import org.eclipse.ui.IEditorPart;

+import org.eclipse.ui.IWorkbenchPart;

+import org.eclipse.ui.ide.IGotoMarker;

+import org.eclipse.ui.part.ShowInContext;

+

+/**

+ * @generated

+ */

+public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderChangeListener, IGotoMarker {

+

+	/**

+	 * @generated

+	 */

+	public static final String ID = "org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorID"; //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final String CONTEXT_ID = "org.eclipse.papyrus.uml.diagram.composite.ui.diagramContext"; //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private KeyHandler paletteKeyHandler = null;

+

+	/**

+	 * @generated

+	 */

+	private MouseListener paletteMouseListener = null;

+

+	/**

+	 * @generated

+	 */

+	private OperationHistoryDirtyState dirtyState;

+

+	/**

+	 * @generated

+	 */

+	private TransactionalEditingDomain editingDomain;

+

+	/**

+	 * @generated

+	 */

+	private IDocumentProvider documentProvider;

+

+	/**

+	 * @generated

+	 */

+	public UMLDiagramEditor(ServicesRegistry servicesRegistry, Diagram diagram) throws ServiceException {

+		super(servicesRegistry, diagram);

+

+		// adds a listener to the palette service, which reacts to palette customizations

+		PapyrusPaletteService.getInstance().addProviderChangeListener(this);

+

+		// Share the same editing provider

+		editingDomain = servicesRegistry.getService(TransactionalEditingDomain.class);

+		documentProvider = new GmfMultiDiagramDocumentProvider(editingDomain);

+

+		// overrides editing domain created by super constructor

+		setDocumentProvider(documentProvider);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getContextID() {

+		return CONTEXT_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected PaletteRoot createPaletteRoot(PaletteRoot existingPaletteRoot) {

+		PaletteRoot paletteRoot;

+		if(existingPaletteRoot == null) {

+			paletteRoot = PapyrusPaletteService.getInstance().createPalette(this, getDefaultPaletteContent());

+		} else {

+			PapyrusPaletteService.getInstance().updatePalette(existingPaletteRoot, this, getDefaultPaletteContent());

+			paletteRoot = existingPaletteRoot;

+		}

+		applyCustomizationsToPalette(paletteRoot);

+		return paletteRoot;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected PreferencesHint getPreferencesHint() {

+		return UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT;

+	}

+

+	/**

+	 * @generated

+	 */

+	public String getContributorId() {

+		return UMLDiagramEditorPlugin.ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected final IDocumentProvider getDocumentProvider(IEditorInput input) {

+		return documentProvider;

+	}

+

+	/**

+	 * @generated

+	 */

+	public TransactionalEditingDomain getEditingDomain() {

+		return editingDomain;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected final void setDocumentProvider(IEditorInput input) {

+		// Already set in the constructor

+	}

+

+	/**

+	 * @generated

+	 */

+	public void gotoMarker(IMarker marker) {

+		MarkerNavigationService.getInstance().gotoMarker(this, marker);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean isSaveAsAllowed() {

+		return true;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void doSaveAs() {

+		performSaveAs(new NullProgressMonitor());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void performSaveAs(IProgressMonitor progressMonitor) {

+		// Nothing

+	}

+

+	/**

+	 * @generated

+	 */

+	public ShowInContext getShowInContext() {

+		return new ShowInContext(getEditorInput(), getGraphicalViewer().getSelection());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void configureGraphicalViewer() {

+		super.configureGraphicalViewer();

+		DiagramEditorContextMenuProvider provider = new DiagramEditorContextMenuProvider(this, getDiagramGraphicalViewer());

+		getDiagramGraphicalViewer().setContextMenu(provider);

+		getSite().registerContextMenu(ActionIds.DIAGRAM_EDITOR_CONTEXT_MENU, provider, getDiagramGraphicalViewer());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected TransactionalEditingDomain createEditingDomain() {

+		// Already configured

+		return editingDomain;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void configureDiagramEditDomain() {

+		super.configureDiagramEditDomain();

+		getDiagramEditDomain().getDiagramCommandStack().addCommandStackListener(new CommandStackListener() {

+

+			public void commandStackChanged(EventObject event) {

+				firePropertyChange(IEditorPart.PROP_DIRTY);

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	public void doSave(IProgressMonitor progressMonitor) {

+		// The saving of the resource is done by the CoreMultiDiagramEditor

+		getDirtyState().saved();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected OperationHistoryDirtyState getDirtyState() {

+		if(dirtyState == null) {

+			dirtyState = OperationHistoryDirtyState.newInstance(getUndoContext(), getOperationHistory());

+		}

+		return dirtyState;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setUndoContext(IUndoContext context) {

+		if(dirtyState != null) {

+			dirtyState.dispose();

+			dirtyState = null;

+		}

+

+		super.setUndoContext(context);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean isDirty() {

+		return getDirtyState().isDirty();

+	}

+

+	/**

+	 * @generated

+	 */

+	public void providerChanged(ProviderChangeEvent event) {

+		// update the palette if the palette service has changed

+		if(PapyrusPaletteService.getInstance().equals(event.getSource())) {

+			PapyrusPaletteService.getInstance().updatePalette(getPaletteViewer().getPaletteRoot(), this, getDefaultPaletteContent());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void dispose() {

+		// remove palette service listener

+		// remove preference listener

+		PapyrusPaletteService.getInstance().removeProviderChangeListener(this);

+

+		if(dirtyState != null) {

+			dirtyState.dispose();

+			dirtyState = null;

+		}

+

+		super.dispose();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected PaletteViewer getPaletteViewer() {

+		return getEditDomain().getPaletteViewer();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected PaletteViewer constructPaletteViewer() {

+		return new PapyrusPaletteViewer();

+	}

+

+	/**

+	 * @generated

+	 */

+	protected PaletteViewerProvider createPaletteViewerProvider() {

+		getEditDomain().setPaletteRoot(createPaletteRoot(null));

+		return new PaletteViewerProvider(getEditDomain()) {

+

+			/**

+			 * Override to provide the additional behavior for the tools. Will intialize with a

+			 * PaletteEditPartFactory that has a TrackDragger that understand how to handle the

+			 * mouseDoubleClick event for shape creation tools. Also will initialize the palette

+			 * with a defaultTool that is the SelectToolEx that undestands how to handle the enter

+			 * key which will result in the creation of the shape also.

+			 */

+			protected void configurePaletteViewer(PaletteViewer viewer) {

+				super.configurePaletteViewer(viewer);

+

+				// customize menu...

+				viewer.setContextMenu(new PapyrusPaletteContextMenuProvider(viewer));

+

+				viewer.getKeyHandler().setParent(getPaletteKeyHandler());

+				viewer.getControl().addMouseListener(getPaletteMouseListener());

+

+				// Add a transfer drag target listener that is supported on

+				// palette template entries whose template is a creation tool.

+				// This will enable drag and drop of the palette shape creation

+				// tools.

+				viewer.addDragSourceListener(new PaletteToolTransferDragSourceListener(viewer));

+				viewer.setCustomizer(createPaletteCustomizer());

+			}

+

+			public PaletteViewer createPaletteViewer(Composite parent) {

+				PaletteViewer pViewer = constructPaletteViewer();

+				pViewer.createControl(parent);

+				configurePaletteViewer(pViewer);

+				hookPaletteViewer(pViewer);

+				return pViewer;

+			}

+

+			/**

+			 * @return Palette Key Handler for the palette

+			 */

+			private KeyHandler getPaletteKeyHandler() {

+

+				if(paletteKeyHandler == null) {

+

+					paletteKeyHandler = new KeyHandler() {

+

+						/**

+						 * Processes a <i>key released </i> event. This method is called by the Tool

+						 * whenever a key is released, and the Tool is in the proper state. Override

+						 * to support pressing the enter key to create a shape or connection

+						 * (between two selected shapes)

+						 * 

+						 * @param event

+						 *        the KeyEvent

+						 * @return <code>true</code> if KeyEvent was handled in some way

+						 */

+						public boolean keyReleased(KeyEvent event) {

+

+							if(event.keyCode == SWT.Selection) {

+

+								Tool tool = getPaletteViewer().getActiveTool().createTool();

+

+								if(toolSupportsAccessibility(tool)) {

+

+									tool.keyUp(event, getDiagramGraphicalViewer());

+

+									// deactivate current selection

+									getPaletteViewer().setActiveTool(null);

+

+									return true;

+								}

+

+							}

+							return super.keyReleased(event);

+						}

+

+					};

+

+				}

+				return paletteKeyHandler;

+			}

+

+			/**

+			 * @return Palette Mouse listener for the palette

+			 */

+			private MouseListener getPaletteMouseListener() {

+

+				if(paletteMouseListener == null) {

+

+					paletteMouseListener = new MouseListener() {

+

+						/**

+						 * Flag to indicate that the current active tool should be cleared after a

+						 * mouse double-click event.

+						 */

+						private boolean clearActiveTool = false;

+

+						/**

+						 * Override to support double-clicking a palette tool entry to create a

+						 * shape or connection (between two selected shapes).

+						 * 

+						 * @see MouseListener#mouseDoubleClick(MouseEvent)

+						 */

+						public void mouseDoubleClick(MouseEvent e) {

+							Tool tool = getPaletteViewer().getActiveTool().createTool();

+

+							if(toolSupportsAccessibility(tool)) {

+

+								tool.setViewer(getDiagramGraphicalViewer());

+								tool.setEditDomain(getDiagramGraphicalViewer().getEditDomain());

+								tool.mouseDoubleClick(e, getDiagramGraphicalViewer());

+

+								// Current active tool should be deactivated,

+								// but if it is down here it will get

+								// reactivated deep in GEF palette code after

+								// receiving mouse up events.

+								clearActiveTool = true;

+							}

+						}

+

+						public void mouseDown(MouseEvent e) {

+							// do nothing

+						}

+

+						public void mouseUp(MouseEvent e) {

+							// Deactivate current active tool here if a

+							// double-click was handled.

+							if(clearActiveTool) {

+								getPaletteViewer().setActiveTool(null);

+								clearActiveTool = false;

+							}

+

+						}

+					};

+

+				}

+				return paletteMouseListener;

+			}

+

+		};

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public GraphicalViewer getGraphicalViewer() {

+		return super.getGraphicalViewer();

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	protected void initializeGraphicalViewer() {

+		super.initializeGraphicalViewer();

+

+		// Enable Drop

+		getDiagramGraphicalViewer().addDropTargetListener(new DropTargetListener(getDiagramGraphicalViewer(), LocalSelectionTransfer.getTransfer()) {

+

+			@Override

+			protected Object getJavaObject(TransferData data) {

+				// It is usual for the transfer data not to be set because it is available locally

+				return LocalSelectionTransfer.getTransfer().getSelection();

+			}

+

+			@Override

+			protected TransactionalEditingDomain getTransactionalEditingDomain() {

+				return getEditingDomain();

+			}

+		});

+

+	}

+

+	/**

+	 * @generated

+	 */

+	@Override

+	public void selectionChanged(IWorkbenchPart part, ISelection selection) {

+		if(getSite().getPage().getActiveEditor() instanceof IMultiDiagramEditor) {

+			IMultiDiagramEditor editor = (IMultiDiagramEditor)getSite().getPage().getActiveEditor();

+			// If not the active editor, ignore selection changed.

+			if(this.equals(editor.getActiveEditor())) {

+				updateActions(getSelectionActions());

+				super.selectionChanged(part, selection);

+			} else {

+				super.selectionChanged(part, selection);

+			}

+		} else {

+			super.selectionChanged(part, selection);

+		}

+		// from

+		// org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor.selectionChanged(IWorkbenchPart,

+		// ISelection)

+		if(part == this) {

+			rebuildStatusLine();

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorPlugin.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorPlugin.java
index f76845b5ce6..1a9ba6f06df 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorPlugin.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorPlugin.java
@@ -1,314 +1,300 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.part;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;
-import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;
-import org.eclipse.papyrus.uml.diagram.composite.preferences.DiagramPreferenceInitializer;
-import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.uml2.uml.edit.providers.UMLItemProviderAdapterFactory;
-import org.osgi.framework.BundleContext;
-
-/**
- * @generated
- */
-public class UMLDiagramEditorPlugin extends AbstractUIPlugin {
-	/**
-	 * @generated
-	 */
-	public static final String ID = "org.eclipse.papyrus.uml.diagram.composite"; //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final PreferencesHint DIAGRAM_PREFERENCES_HINT =
-			new PreferencesHint(ID);
-	/**
-	 * @generated
-	 */
-	private static UMLDiagramEditorPlugin instance;
-	/**
-	 * @generated
-	 */
-	private ComposedAdapterFactory adapterFactory;
-	/**
-	 * @generated
-	 */
-	private UMLDocumentProvider documentProvider;
-	/**
-	 * @generated
-	 */
-	private UMLBaseItemSemanticEditPolicy.LinkConstraints linkConstraints;
-	/**
-	 * @generated
-	 */
-	private ElementInitializers initializers;
-
-	/**
-	 * @generated
-	 */
-	public UMLDiagramEditorPlugin() {
-	}
-
-	/**
-	 * @generated
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		instance = this;
-		PreferencesHint.registerPreferenceStore(DIAGRAM_PREFERENCES_HINT, getPreferenceStore());
-		adapterFactory = createAdapterFactory();
-		DiagramPreferenceInitializer diagramPreferenceInitializer = new DiagramPreferenceInitializer();
-		diagramPreferenceInitializer.initializeDefaultPreferences();
-	}
-
-	/**
-	 * @generated
-	 */
-	public void stop(BundleContext context) throws Exception {
-		adapterFactory.dispose();
-		adapterFactory = null;
-		linkConstraints = null;
-		initializers = null;
-		instance = null;
-		super.stop(context);
-	}
-
-	/**
-	 * @generated
-	 */
-	public static UMLDiagramEditorPlugin getInstance() {
-		return instance;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IPreferenceStore getPreferenceStore() {
-		IPreferenceStore store = Activator.getDefault().getPreferenceStore();
-		return store;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected ComposedAdapterFactory createAdapterFactory() {
-		ArrayList<AdapterFactory> factories = new ArrayList<AdapterFactory>();
-		fillItemProviderFactories(factories);
-		return new ComposedAdapterFactory(factories);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void fillItemProviderFactories(List<AdapterFactory> factories) {
-		factories.add(new UMLItemProviderAdapterFactory());
-		factories.add(new EcoreItemProviderAdapterFactory());
-		factories.add(new ResourceItemProviderAdapterFactory());
-		factories.add(new ReflectiveItemProviderAdapterFactory());
-	}
-
-	/**
-	 * @generated
-	 */
-	public AdapterFactory getItemProvidersAdapterFactory() {
-		return adapterFactory;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ImageDescriptor getItemImageDescriptor(Object item) {
-		IItemLabelProvider labelProvider =
-				(IItemLabelProvider) adapterFactory.adapt(
-						item, IItemLabelProvider.class);
-		if (labelProvider != null) {
-			return ExtendedImageRegistry.getInstance().getImageDescriptor(
-					labelProvider.getImage(item));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 * 
-	 * @generated
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getBundledImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(ID, path);
-	}
-
-	/**
-	 * Respects images residing in any plug-in. If path is relative,
-	 * then this bundle is looked up for the image, otherwise, for absolute
-	 * path, first segment is taken as id of plug-in with image
-	 * 
-	 * @generated
-	 * @param path the path to image, either absolute (with plug-in id as first segment), or relative for bundled images
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor findImageDescriptor(String path) {
-		final IPath p = new Path(path);
-		if (p.isAbsolute() && p.segmentCount() > 1) {
-			return AbstractUIPlugin.imageDescriptorFromPlugin(
-					p.segment(0), p.removeFirstSegments(1).makeAbsolute().toString());
-		} else {
-			return getBundledImageDescriptor(p.makeAbsolute().toString());
-		}
-	}
-
-	/**
-	 * Returns an image for the image file at the given plugin relative path.
-	 * Client do not need to dispose this image. Images will be disposed automatically.
-	 * 
-	 * @generated
-	 * @param path the path
-	 * @return image instance
-	 */
-	public Image getBundledImage(String path) {
-		Image image = getImageRegistry().get(path);
-		if (image == null) {
-			getImageRegistry().put(path, getBundledImageDescriptor(path));
-			image = getImageRegistry().get(path);
-		}
-		return image;
-	}
-
-	/**
-	 * Returns string from plug-in's resource bundle
-	 * 
-	 * @generated
-	 */
-	public static String getString(String key) {
-		return Platform.getResourceString(
-				getInstance().getBundle(), "%" + key); //$NON-NLS-1$
-	}
-
-	/**
-	 * @generated
-	 */
-	public UMLDocumentProvider getDocumentProvider() {
-		if (documentProvider == null) {
-			documentProvider = new UMLDocumentProvider();
-		}
-		return documentProvider;
-	}
-
-	/**
-	 * @generated
-	 */
-	public UMLBaseItemSemanticEditPolicy.LinkConstraints getLinkConstraints() {
-		return linkConstraints;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setLinkConstraints(UMLBaseItemSemanticEditPolicy.LinkConstraints lc) {
-		this.linkConstraints = lc;
-	}
-
-	/**
-	 * @generated
-	 */
-	public ElementInitializers getElementInitializers() {
-		return initializers;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void setElementInitializers(ElementInitializers i) {
-		this.initializers = i;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void logError(String error) {
-		logError(error, null);
-	}
-
-	/**
-	 * @generated
-	 */
-	public void logError(String error, Throwable throwable) {
-		if (error == null && throwable != null) {
-			error = throwable.getMessage();
-		}
-		getLog().log(new Status(
-				IStatus.ERROR,
-				UMLDiagramEditorPlugin.ID,
-				IStatus.OK,
-				error, throwable));
-		debug(error, throwable);
-	}
-
-	/**
-	 * @generated
-	 */
-	public void logInfo(String message) {
-		logInfo(message, null);
-	}
-
-	/**
-	 * @generated
-	 */
-	public void logInfo(String message, Throwable throwable) {
-		if (message == null && throwable != null) {
-			message = throwable.getMessage();
-		}
-		getLog().log(new Status(
-				IStatus.INFO,
-				UMLDiagramEditorPlugin.ID,
-				IStatus.OK,
-				message, throwable));
-		debug(message, throwable);
-	}
-
-	/**
-	 * @generated
-	 */
-	private void debug(String message, Throwable throwable) {
-		if (!isDebugging()) {
-			return;
-		}
-		if (message != null) {
-			System.err.println(message);
-		}
-		if (throwable != null) {
-			throwable.printStackTrace();
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.part;

+

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IPath;

+import org.eclipse.core.runtime.Path;

+import org.eclipse.core.runtime.Platform;

+import org.eclipse.emf.common.notify.AdapterFactory;

+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;

+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

+import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

+import org.eclipse.jface.preference.IPreferenceStore;

+import org.eclipse.jface.resource.ImageDescriptor;

+import org.eclipse.papyrus.infra.core.log.LogHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.Activator;

+import org.eclipse.papyrus.uml.diagram.composite.edit.policies.UMLBaseItemSemanticEditPolicy;

+import org.eclipse.papyrus.uml.diagram.composite.preferences.DiagramPreferenceInitializer;

+import org.eclipse.papyrus.uml.diagram.composite.providers.ElementInitializers;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.ui.plugin.AbstractUIPlugin;

+import org.eclipse.uml2.uml.edit.providers.UMLItemProviderAdapterFactory;

+import org.osgi.framework.BundleContext;

+

+/**

+ * @generated

+ */

+public class UMLDiagramEditorPlugin extends AbstractUIPlugin {

+

+	/**

+	 * @generated

+	 */

+	public static final String ID = "org.eclipse.papyrus.uml.diagram.composite"; //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private LogHelper myLogHelper;

+

+	/**

+	 * @generated

+	 */

+	public static final PreferencesHint DIAGRAM_PREFERENCES_HINT = new PreferencesHint(ID);

+

+	/**

+	 * @generated

+	 */

+	private static UMLDiagramEditorPlugin instance;

+

+	/**

+	 * @generated

+	 */

+	private ComposedAdapterFactory adapterFactory;

+

+	/**

+	 * @generated

+	 */

+	private UMLDocumentProvider documentProvider;

+

+	/**

+	 * @generated

+	 */

+	private UMLBaseItemSemanticEditPolicy.LinkConstraints linkConstraints;

+

+	/**

+	 * @generated

+	 */

+	private ElementInitializers initializers;

+

+	/**

+	 * @generated

+	 */

+	public UMLDiagramEditorPlugin() {

+	}

+

+	/**

+	 * @generated

+	 */

+	public void start(BundleContext context) throws Exception {

+		super.start(context);

+		instance = this;

+		myLogHelper = new LogHelper(this);

+		PreferencesHint.registerPreferenceStore(DIAGRAM_PREFERENCES_HINT, getPreferenceStore());

+		adapterFactory = createAdapterFactory();

+		DiagramPreferenceInitializer diagramPreferenceInitializer = new DiagramPreferenceInitializer();

+		diagramPreferenceInitializer.initializeDefaultPreferences();

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public void stop(BundleContext context) throws Exception {

+		adapterFactory.dispose();

+		adapterFactory = null;

+		linkConstraints = null;

+		initializers = null;

+		instance = null;

+		super.stop(context);

+	}

+

+	/**

+	 * @generated

+	 */

+	public static UMLDiagramEditorPlugin getInstance() {

+		return instance;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IPreferenceStore getPreferenceStore() {

+		IPreferenceStore store = Activator.getDefault().getPreferenceStore();

+		return store;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected ComposedAdapterFactory createAdapterFactory() {

+		ArrayList<AdapterFactory> factories = new ArrayList<AdapterFactory>();

+		fillItemProviderFactories(factories);

+		return new ComposedAdapterFactory(factories);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void fillItemProviderFactories(List<AdapterFactory> factories) {

+		factories.add(new UMLItemProviderAdapterFactory());

+		factories.add(new EcoreItemProviderAdapterFactory());

+		factories.add(new ResourceItemProviderAdapterFactory());

+		factories.add(new ReflectiveItemProviderAdapterFactory());

+	}

+

+	/**

+	 * @generated

+	 */

+	public AdapterFactory getItemProvidersAdapterFactory() {

+		return adapterFactory;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ImageDescriptor getItemImageDescriptor(Object item) {

+		IItemLabelProvider labelProvider = (IItemLabelProvider)adapterFactory.adapt(item, IItemLabelProvider.class);

+		if(labelProvider != null) {

+			return ExtendedImageRegistry.getInstance().getImageDescriptor(labelProvider.getImage(item));

+		}

+		return null;

+	}

+

+	/**

+	 * Returns an image descriptor for the image file at the given

+	 * plug-in relative path.

+	 * 

+	 * @generated

+	 * @param path

+	 *        the path

+	 * @return the image descriptor

+	 */

+	public static ImageDescriptor getBundledImageDescriptor(String path) {

+		return AbstractUIPlugin.imageDescriptorFromPlugin(ID, path);

+	}

+

+	/**

+	 * Respects images residing in any plug-in. If path is relative,

+	 * then this bundle is looked up for the image, otherwise, for absolute

+	 * path, first segment is taken as id of plug-in with image

+	 * 

+	 * @generated

+	 * @param path

+	 *        the path to image, either absolute (with plug-in id as first segment), or relative for bundled images

+	 * @return the image descriptor

+	 */

+	public static ImageDescriptor findImageDescriptor(String path) {

+		final IPath p = new Path(path);

+		if(p.isAbsolute() && p.segmentCount() > 1) {

+			return AbstractUIPlugin.imageDescriptorFromPlugin(p.segment(0), p.removeFirstSegments(1).makeAbsolute().toString());

+		} else {

+			return getBundledImageDescriptor(p.makeAbsolute().toString());

+		}

+	}

+

+	/**

+	 * Returns an image for the image file at the given plugin relative path.

+	 * Client do not need to dispose this image. Images will be disposed automatically.

+	 * 

+	 * @generated

+	 * @param path

+	 *        the path

+	 * @return image instance

+	 */

+	public Image getBundledImage(String path) {

+		Image image = getImageRegistry().get(path);

+		if(image == null) {

+			getImageRegistry().put(path, getBundledImageDescriptor(path));

+			image = getImageRegistry().get(path);

+		}

+		return image;

+	}

+

+	/**

+	 * Returns string from plug-in's resource bundle

+	 * 

+	 * @generated

+	 */

+	public static String getString(String key) {

+		return Platform.getResourceString(getInstance().getBundle(), "%" + key); //$NON-NLS-1$

+	}

+

+	/**

+	 * @generated

+	 */

+	public UMLDocumentProvider getDocumentProvider() {

+		if(documentProvider == null) {

+			documentProvider = new UMLDocumentProvider();

+		}

+		return documentProvider;

+	}

+

+	/**

+	 * @generated

+	 */

+	public UMLBaseItemSemanticEditPolicy.LinkConstraints getLinkConstraints() {

+		return linkConstraints;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setLinkConstraints(UMLBaseItemSemanticEditPolicy.LinkConstraints lc) {

+		this.linkConstraints = lc;

+	}

+

+	/**

+	 * @generated

+	 */

+	public ElementInitializers getElementInitializers() {

+		return initializers;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void setElementInitializers(ElementInitializers i) {

+		this.initializers = i;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void logError(String error) {

+		getLogHelper().warn(error);

+	}

+

+	/**

+	 * @generated

+	 */

+	public void logError(String error, Throwable throwable) {

+		getLogHelper().error(error, throwable);

+	}

+

+	/**

+	 * @generated

+	 */

+	public void logInfo(String message) {

+		getLogHelper().info(message);

+	}

+

+	/**

+	 * @generated

+	 */

+	public void logInfo(String message, Throwable throwable) {

+		getLogHelper().error(message, throwable);

+	}

+

+	/**

+	 * @generated

+	 */

+	public LogHelper getLogHelper() {

+		return myLogHelper;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorUtil.java
index d1c94af7192..a6f865f3ae9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditorUtil.java
@@ -1,341 +1,359 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.part;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.part.DefaultDiagramEditorUtil;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-
-/**
- * @generated
- */
-public class UMLDiagramEditorUtil {
-	/**
-	 * @generated
-	 */
-	public static Map<?, ?> getSaveOptions() {
-		HashMap<String, Object> saveOptions = new HashMap<String, Object>();
-		saveOptions.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$
-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
-		return saveOptions;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static boolean openDiagram(Resource diagram) throws PartInitException {
-		String path = diagram.getURI().toPlatformString(true);
-		IResource workspaceResource = ResourcesPlugin.getWorkspace().getRoot().findMember(new Path(path));
-		if (workspaceResource instanceof IFile) {
-			IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-			return null != page.openEditor(new FileEditorInput((IFile) workspaceResource), UMLDiagramEditor.ID);
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void setCharset(IFile file) {
-		if (file == null) {
-			return;
-		}
-		try {
-			file.setCharset("UTF-8", new NullProgressMonitor()); //$NON-NLS-1$
-		} catch (CoreException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Unable to set charset for file " + file.getFullPath(), e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public static String getUniqueFileName(IPath containerFullPath, String fileName, String extension) {
-		return DefaultDiagramEditorUtil.getUniqueFileName(containerFullPath, fileName, extension,
-				DefaultDiagramEditorUtil.EXISTS_IN_WORKSPACE);
-	}
-
-	/**
-	 * Runs the wizard in a dialog.
-	 * 
-	 * @generated
-	 */
-	public static void runWizard(Shell shell, Wizard wizard, String settingsKey) {
-		IDialogSettings pluginDialogSettings = UMLDiagramEditorPlugin.getInstance().getDialogSettings();
-		IDialogSettings wizardDialogSettings = pluginDialogSettings.getSection(settingsKey);
-		if (wizardDialogSettings == null) {
-			wizardDialogSettings = pluginDialogSettings.addNewSection(settingsKey);
-		}
-		wizard.setDialogSettings(wizardDialogSettings);
-		WizardDialog dialog = new WizardDialog(shell, wizard);
-		dialog.create();
-		dialog.getShell().setSize(Math.max(500, dialog.getShell().getSize().x), 500);
-		dialog.open();
-	}
-
-	/**
-	 * This method should be called within a workspace modify operation since it creates resources.
-	 * @generated
-	 */
-	public static Resource createDiagram(URI diagramURI, URI modelURI, IProgressMonitor progressMonitor) {
-		TransactionalEditingDomain editingDomain = GMFEditingDomainFactory.INSTANCE.createEditingDomain();
-		progressMonitor.beginTask(Messages.UMLDiagramEditorUtil_CreateDiagramProgressTask, 3);
-		final Resource diagramResource = editingDomain.getResourceSet().createResource(diagramURI);
-		final Resource modelResource = editingDomain.getResourceSet().createResource(modelURI);
-		final String diagramName = diagramURI.lastSegment();
-		AbstractTransactionalCommand command = new AbstractTransactionalCommand(editingDomain, Messages.UMLDiagramEditorUtil_CreateDiagramCommandLabel, Collections.EMPTY_LIST) {
-			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-				Package model = createInitialModel();
-				attachModelToResource(model, modelResource);
-				Diagram diagram = ViewService.createDiagram(
-						model,
-						CompositeStructureDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
-				if (diagram != null) {
-					diagramResource.getContents().add(diagram);
-					diagram.setName(diagramName);
-					diagram.setElement(model);
-				}
-				try {
-					modelResource.save(org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorUtil.getSaveOptions());
-					diagramResource.save(org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorUtil.getSaveOptions());
-				} catch (IOException e) {
-					UMLDiagramEditorPlugin.getInstance().logError("Unable to store model and diagram resources", e); //$NON-NLS-1$
-				}
-				return CommandResult.newOKCommandResult();
-			}
-		};
-		try {
-			OperationHistoryFactory.getOperationHistory().execute(command, new SubProgressMonitor(progressMonitor, 1), null);
-		} catch (ExecutionException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Unable to create model and diagram", e); //$NON-NLS-1$
-		}
-		setCharset(WorkspaceSynchronizer.getFile(modelResource));
-		setCharset(WorkspaceSynchronizer.getFile(diagramResource));
-		return diagramResource;
-	}
-
-	/**
-	 * Create a new instance of domain element associated with canvas.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static Package createInitialModel() {
-		return UMLFactory.eINSTANCE.createPackage();
-	}
-
-	/**
-	 * Store model element in the resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static void attachModelToResource(Package model, Resource resource) {
-		resource.getContents().add(model);
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void selectElementsInDiagram(IDiagramWorkbenchPart diagramPart, List<EditPart> editParts) {
-		diagramPart.getDiagramGraphicalViewer().deselectAll();
-		EditPart firstPrimary = null;
-		for (EditPart nextPart : editParts) {
-			diagramPart.getDiagramGraphicalViewer().appendSelection(nextPart);
-			if (firstPrimary == null && nextPart instanceof IPrimaryEditPart) {
-				firstPrimary = nextPart;
-			}
-		}
-		if (!editParts.isEmpty()) {
-			diagramPart.getDiagramGraphicalViewer().reveal(firstPrimary != null ? firstPrimary : (EditPart) editParts.get(0));
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static int findElementsInDiagramByID(DiagramEditPart diagramPart, EObject element, List<EditPart> editPartCollector) {
-		IDiagramGraphicalViewer viewer = (IDiagramGraphicalViewer) diagramPart.getViewer();
-		final int intialNumOfEditParts = editPartCollector.size();
-		if (element instanceof View) { // support notation element lookup
-			EditPart editPart = (EditPart) viewer.getEditPartRegistry().get(element);
-			if (editPart != null) {
-				editPartCollector.add(editPart);
-				return 1;
-			}
-		}
-		String elementID = EMFCoreUtil.getProxyID(element);
-		@SuppressWarnings("unchecked")
-		List<EditPart> associatedParts = viewer.findEditPartsForElement(elementID, IGraphicalEditPart.class);
-		// perform the possible hierarchy disjoint -> take the top-most parts only
-		for (EditPart nextPart : associatedParts) {
-			EditPart parentPart = nextPart.getParent();
-			while (parentPart != null && !associatedParts.contains(parentPart)) {
-				parentPart = parentPart.getParent();
-			}
-			if (parentPart == null) {
-				editPartCollector.add(nextPart);
-			}
-		}
-		if (intialNumOfEditParts == editPartCollector.size()) {
-			if (!associatedParts.isEmpty()) {
-				editPartCollector.add(associatedParts.get(0));
-			} else {
-				if (element.eContainer() != null) {
-					return findElementsInDiagramByID(diagramPart, element.eContainer(), editPartCollector);
-				}
-			}
-		}
-		return editPartCollector.size() - intialNumOfEditParts;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static View findView(DiagramEditPart diagramEditPart, EObject targetElement, LazyElement2ViewMap lazyElement2ViewMap) {
-		boolean hasStructuralURI = false;
-		if (targetElement.eResource() instanceof XMLResource) {
-			hasStructuralURI = ((XMLResource) targetElement.eResource()).getID(targetElement) == null;
-		}
-		View view = null;
-		LinkedList<EditPart> editPartHolder = new LinkedList<EditPart>();
-		if (hasStructuralURI && !lazyElement2ViewMap.getElement2ViewMap().isEmpty()) {
-			view = lazyElement2ViewMap.getElement2ViewMap().get(targetElement);
-		} else if (findElementsInDiagramByID(diagramEditPart, targetElement, editPartHolder) > 0) {
-			EditPart editPart = editPartHolder.get(0);
-			view = editPart.getModel() instanceof View ? (View) editPart.getModel() : null;
-		}
-		return (view == null) ? diagramEditPart.getDiagramView() : view;
-	}
-
-	/**
-	 * XXX This is quite suspicious code (especially editPartTmpHolder) and likely to be removed soon
-	 * @generated
-	 */
-	public static class LazyElement2ViewMap {
-		/**
-		 * @generated
-		 */
-		private Map<EObject, View> element2ViewMap;
-		/**
-		 * @generated
-		 */
-		private View scope;
-		/**
-		 * @generated
-		 */
-		private Set<? extends EObject> elementSet;
-
-		/**
-		 * @generated
-		 */
-		public LazyElement2ViewMap(View scope, Set<? extends EObject> elements) {
-			this.scope = scope;
-			this.elementSet = elements;
-		}
-
-		/**
-		 * @generated
-		 */
-		public final Map<EObject, View> getElement2ViewMap() {
-			if (element2ViewMap == null) {
-				element2ViewMap = new HashMap<EObject, View>();
-				// map possible notation elements to itself as these can't be found by view.getElement()
-				for (EObject element : elementSet) {
-					if (element instanceof View) {
-						View view = (View) element;
-						if (view.getDiagram() == scope.getDiagram()) {
-							element2ViewMap.put(element, view); // take only those that part of our diagram
-						}
-					}
-				}
-				buildElement2ViewMap(scope, element2ViewMap, elementSet);
-			}
-			return element2ViewMap;
-		}
-
-		/**
-		 * @generated
-		 */
-		private static boolean buildElement2ViewMap(View parentView, Map<EObject, View> element2ViewMap, Set<? extends EObject> elements) {
-			if (elements.size() == element2ViewMap.size()) {
-				return true;
-			}
-			if (parentView.isSetElement() && !element2ViewMap.containsKey(parentView.getElement()) && elements.contains(parentView.getElement())) {
-				element2ViewMap.put(parentView.getElement(), parentView);
-				if (elements.size() == element2ViewMap.size()) {
-					return true;
-				}
-			}
-			boolean complete = false;
-			for (Iterator<?> it = parentView.getChildren().iterator(); it.hasNext() && !complete;) {
-				complete = buildElement2ViewMap((View) it.next(), element2ViewMap, elements);
-			}
-			for (Iterator<?> it = parentView.getSourceEdges().iterator(); it.hasNext() && !complete;) {
-				complete = buildElement2ViewMap((View) it.next(), element2ViewMap, elements);
-			}
-			for (Iterator<?> it = parentView.getTargetEdges().iterator(); it.hasNext() && !complete;) {
-				complete = buildElement2ViewMap((View) it.next(), element2ViewMap, elements);
-			}
-			return complete;
-		}
-	} //LazyElement2ViewMap	
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.part;

+

+import java.io.IOException;

+import java.util.Collections;

+import java.util.HashMap;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Map;

+import java.util.Set;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.commands.operations.OperationHistoryFactory;

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IResource;

+import org.eclipse.core.resources.ResourcesPlugin;

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IPath;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.core.runtime.NullProgressMonitor;

+import org.eclipse.core.runtime.Path;

+import org.eclipse.core.runtime.SubProgressMonitor;

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.xmi.XMLResource;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.diagram.core.services.ViewService;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;

+import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;

+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;

+import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.part.DefaultDiagramEditorUtil;

+import org.eclipse.jface.dialogs.IDialogSettings;

+import org.eclipse.jface.wizard.Wizard;

+import org.eclipse.jface.wizard.WizardDialog;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.ui.IWorkbenchPage;

+import org.eclipse.ui.PartInitException;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.ui.part.FileEditorInput;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.UMLFactory;

+

+/**

+ * @generated

+ */

+public class UMLDiagramEditorUtil {

+

+	/**

+	 * @generated

+	 */

+	public static Map<?, ?> getSaveOptions() {

+		HashMap<String, Object> saveOptions = new HashMap<String, Object>();

+		saveOptions.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$

+		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);

+		return saveOptions;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static boolean openDiagram(Resource diagram) throws PartInitException {

+		String path = diagram.getURI().toPlatformString(true);

+		IResource workspaceResource = ResourcesPlugin.getWorkspace().getRoot().findMember(new Path(path));

+		if(workspaceResource instanceof IFile) {

+			IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();

+			return null != page.openEditor(new FileEditorInput((IFile)workspaceResource), UMLDiagramEditor.ID);

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static void setCharset(IFile file) {

+		if(file == null) {

+			return;

+		}

+		try {

+			file.setCharset("UTF-8", new NullProgressMonitor()); //$NON-NLS-1$

+		} catch (CoreException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Unable to set charset for file " + file.getFullPath(), e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public static String getUniqueFileName(IPath containerFullPath, String fileName, String extension) {

+		return DefaultDiagramEditorUtil.getUniqueFileName(containerFullPath, fileName, extension, DefaultDiagramEditorUtil.EXISTS_IN_WORKSPACE);

+	}

+

+	/**

+	 * Runs the wizard in a dialog.

+	 * 

+	 * @generated

+	 */

+	public static void runWizard(Shell shell, Wizard wizard, String settingsKey) {

+		IDialogSettings pluginDialogSettings = UMLDiagramEditorPlugin.getInstance().getDialogSettings();

+		IDialogSettings wizardDialogSettings = pluginDialogSettings.getSection(settingsKey);

+		if(wizardDialogSettings == null) {

+			wizardDialogSettings = pluginDialogSettings.addNewSection(settingsKey);

+		}

+		wizard.setDialogSettings(wizardDialogSettings);

+		WizardDialog dialog = new WizardDialog(shell, wizard);

+		dialog.create();

+		dialog.getShell().setSize(Math.max(500, dialog.getShell().getSize().x), 500);

+		dialog.open();

+	}

+

+	/**

+	 * This method should be called within a workspace modify operation since it creates resources.

+	 * 

+	 * @generated

+	 */

+	public static Resource createDiagram(URI diagramURI, URI modelURI, IProgressMonitor progressMonitor) {

+		TransactionalEditingDomain editingDomain = GMFEditingDomainFactory.INSTANCE.createEditingDomain();

+		progressMonitor.beginTask(Messages.UMLDiagramEditorUtil_CreateDiagramProgressTask, 3);

+		final Resource diagramResource = editingDomain.getResourceSet().createResource(diagramURI);

+		final Resource modelResource = editingDomain.getResourceSet().createResource(modelURI);

+		final String diagramName = diagramURI.lastSegment();

+		AbstractTransactionalCommand command = new AbstractTransactionalCommand(editingDomain, Messages.UMLDiagramEditorUtil_CreateDiagramCommandLabel, Collections.EMPTY_LIST) {

+

+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+				Package model = createInitialModel();

+				attachModelToResource(model, modelResource);

+

+				Diagram diagram = ViewService.createDiagram(model, CompositeStructureDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

+				if(diagram != null) {

+					diagramResource.getContents().add(diagram);

+					diagram.setName(diagramName);

+					diagram.setElement(model);

+				}

+

+				try {

+					modelResource.save(org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorUtil.getSaveOptions());

+					diagramResource.save(org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorUtil.getSaveOptions());

+				} catch (IOException e) {

+

+					UMLDiagramEditorPlugin.getInstance().logError("Unable to store model and diagram resources", e); //$NON-NLS-1$

+				}

+				return CommandResult.newOKCommandResult();

+			}

+		};

+		try {

+			OperationHistoryFactory.getOperationHistory().execute(command, new SubProgressMonitor(progressMonitor, 1), null);

+		} catch (ExecutionException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Unable to create model and diagram", e); //$NON-NLS-1$

+		}

+		setCharset(WorkspaceSynchronizer.getFile(modelResource));

+		setCharset(WorkspaceSynchronizer.getFile(diagramResource));

+		return diagramResource;

+	}

+

+	/**

+	 * Create a new instance of domain element associated with canvas.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	private static Package createInitialModel() {

+		return UMLFactory.eINSTANCE.createPackage();

+	}

+

+	/**

+	 * Store model element in the resource.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	private static void attachModelToResource(Package model, Resource resource) {

+		resource.getContents().add(model);

+	}

+

+	/**

+	 * @generated

+	 */

+	public static void selectElementsInDiagram(IDiagramWorkbenchPart diagramPart, List<EditPart> editParts) {

+		diagramPart.getDiagramGraphicalViewer().deselectAll();

+

+		EditPart firstPrimary = null;

+		for(EditPart nextPart : editParts) {

+			diagramPart.getDiagramGraphicalViewer().appendSelection(nextPart);

+			if(firstPrimary == null && nextPart instanceof IPrimaryEditPart) {

+				firstPrimary = nextPart;

+			}

+		}

+

+		if(!editParts.isEmpty()) {

+			diagramPart.getDiagramGraphicalViewer().reveal(firstPrimary != null ? firstPrimary : (EditPart)editParts.get(0));

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private static int findElementsInDiagramByID(DiagramEditPart diagramPart, EObject element, List<EditPart> editPartCollector) {

+		IDiagramGraphicalViewer viewer = (IDiagramGraphicalViewer)diagramPart.getViewer();

+		final int intialNumOfEditParts = editPartCollector.size();

+

+		if(element instanceof View) { // support notation element lookup

+			EditPart editPart = (EditPart)viewer.getEditPartRegistry().get(element);

+			if(editPart != null) {

+				editPartCollector.add(editPart);

+				return 1;

+			}

+		}

+

+		String elementID = EMFCoreUtil.getProxyID(element);

+		@SuppressWarnings("unchecked")

+		List<EditPart> associatedParts = viewer.findEditPartsForElement(elementID, IGraphicalEditPart.class);

+		// perform the possible hierarchy disjoint -> take the top-most parts only

+		for(EditPart nextPart : associatedParts) {

+			EditPart parentPart = nextPart.getParent();

+			while(parentPart != null && !associatedParts.contains(parentPart)) {

+				parentPart = parentPart.getParent();

+			}

+			if(parentPart == null) {

+				editPartCollector.add(nextPart);

+			}

+		}

+

+		if(intialNumOfEditParts == editPartCollector.size()) {

+			if(!associatedParts.isEmpty()) {

+				editPartCollector.add(associatedParts.get(0));

+			} else {

+				if(element.eContainer() != null) {

+					return findElementsInDiagramByID(diagramPart, element.eContainer(), editPartCollector);

+				}

+			}

+		}

+		return editPartCollector.size() - intialNumOfEditParts;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static View findView(DiagramEditPart diagramEditPart, EObject targetElement, LazyElement2ViewMap lazyElement2ViewMap) {

+		boolean hasStructuralURI = false;

+		if(targetElement.eResource() instanceof XMLResource) {

+			hasStructuralURI = ((XMLResource)targetElement.eResource()).getID(targetElement) == null;

+		}

+

+		View view = null;

+		LinkedList<EditPart> editPartHolder = new LinkedList<EditPart>();

+		if(hasStructuralURI && !lazyElement2ViewMap.getElement2ViewMap().isEmpty()) {

+			view = lazyElement2ViewMap.getElement2ViewMap().get(targetElement);

+		} else if(findElementsInDiagramByID(diagramEditPart, targetElement, editPartHolder) > 0) {

+			EditPart editPart = editPartHolder.get(0);

+			view = editPart.getModel() instanceof View ? (View)editPart.getModel() : null;

+		}

+

+		return (view == null) ? diagramEditPart.getDiagramView() : view;

+	}

+

+	/**

+	 * XXX This is quite suspicious code (especially editPartTmpHolder) and likely to be removed soon

+	 * 

+	 * @generated

+	 */

+	public static class LazyElement2ViewMap {

+

+		/**

+		 * @generated

+		 */

+		private Map<EObject, View> element2ViewMap;

+

+		/**

+		 * @generated

+		 */

+		private View scope;

+

+		/**

+		 * @generated

+		 */

+		private Set<? extends EObject> elementSet;

+

+		/**

+		 * @generated

+		 */

+		public LazyElement2ViewMap(View scope, Set<? extends EObject> elements) {

+			this.scope = scope;

+			this.elementSet = elements;

+		}

+

+		/**

+		 * @generated

+		 */

+		public final Map<EObject, View> getElement2ViewMap() {

+			if(element2ViewMap == null) {

+				element2ViewMap = new HashMap<EObject, View>();

+				// map possible notation elements to itself as these can't be found by view.getElement()

+				for(EObject element : elementSet) {

+					if(element instanceof View) {

+						View view = (View)element;

+						if(view.getDiagram() == scope.getDiagram()) {

+							element2ViewMap.put(element, view); // take only those that part of our diagram

+						}

+					}

+				}

+

+				buildElement2ViewMap(scope, element2ViewMap, elementSet);

+			}

+			return element2ViewMap;

+		}

+

+		/**

+		 * @generated

+		 */

+		private static boolean buildElement2ViewMap(View parentView, Map<EObject, View> element2ViewMap, Set<? extends EObject> elements) {

+			if(elements.size() == element2ViewMap.size()) {

+				return true;

+			}

+

+			if(parentView.isSetElement() && !element2ViewMap.containsKey(parentView.getElement()) && elements.contains(parentView.getElement())) {

+				element2ViewMap.put(parentView.getElement(), parentView);

+				if(elements.size() == element2ViewMap.size()) {

+					return true;

+				}

+			}

+			boolean complete = false;

+			for(Iterator<?> it = parentView.getChildren().iterator(); it.hasNext() && !complete;) {

+				complete = buildElement2ViewMap((View)it.next(), element2ViewMap, elements);

+			}

+			for(Iterator<?> it = parentView.getSourceEdges().iterator(); it.hasNext() && !complete;) {

+				complete = buildElement2ViewMap((View)it.next(), element2ViewMap, elements);

+			}

+			for(Iterator<?> it = parentView.getTargetEdges().iterator(); it.hasNext() && !complete;) {

+				complete = buildElement2ViewMap((View)it.next(), element2ViewMap, elements);

+			}

+			return complete;

+		}

+	} //LazyElement2ViewMap	

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdateCommand.java
index ef040f6d5c3..13c59e9fc42 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdateCommand.java
@@ -1,86 +1,88 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.part;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.core.commands.IHandlerListener;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @generated
- */
-public class UMLDiagramUpdateCommand implements IHandler {
-	/**
-	 * @generated
-	 */
-	public void addHandlerListener(IHandlerListener handlerListener) {
-	}
-
-	/**
-	 * @generated
-	 */
-	public void dispose() {
-	}
-
-	/**
-	 * @generated
-	 */
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		ISelection selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-			if (structuredSelection.size() != 1) {
-				return null;
-			}
-			if (structuredSelection.getFirstElement() instanceof EditPart && ((EditPart) structuredSelection.getFirstElement()).getModel() instanceof View) {
-				EObject modelElement = ((View) ((EditPart) structuredSelection.getFirstElement()).getModel()).getElement();
-				List<?> editPolicies = CanonicalEditPolicy.getRegisteredEditPolicies(modelElement);
-				for (Iterator<?> it = editPolicies.iterator(); it.hasNext();) {
-					CanonicalEditPolicy nextEditPolicy = (CanonicalEditPolicy) it.next();
-					nextEditPolicy.refresh();
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean isEnabled() {
-		return true;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean isHandled() {
-		return true;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void removeHandlerListener(IHandlerListener handlerListener) {
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.part;

+

+import java.util.Iterator;

+import java.util.List;

+

+import org.eclipse.core.commands.ExecutionEvent;

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.commands.IHandler;

+import org.eclipse.core.commands.IHandlerListener;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.ui.PlatformUI;

+

+/**

+ * @generated

+ */

+public class UMLDiagramUpdateCommand implements IHandler {

+

+	/**

+	 * @generated

+	 */

+	public void addHandlerListener(IHandlerListener handlerListener) {

+	}

+

+	/**

+	 * @generated

+	 */

+	public void dispose() {

+	}

+

+	/**

+	 * @generated

+	 */

+	public Object execute(ExecutionEvent event) throws ExecutionException {

+		ISelection selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();

+		if(selection instanceof IStructuredSelection) {

+			IStructuredSelection structuredSelection = (IStructuredSelection)selection;

+			if(structuredSelection.size() != 1) {

+				return null;

+			}

+			if(structuredSelection.getFirstElement() instanceof EditPart && ((EditPart)structuredSelection.getFirstElement()).getModel() instanceof View) {

+				EObject modelElement = ((View)((EditPart)structuredSelection.getFirstElement()).getModel()).getElement();

+				List<?> editPolicies = CanonicalEditPolicy.getRegisteredEditPolicies(modelElement);

+				for(Iterator<?> it = editPolicies.iterator(); it.hasNext();) {

+					CanonicalEditPolicy nextEditPolicy = (CanonicalEditPolicy)it.next();

+					nextEditPolicy.refresh();

+				}

+

+			}

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean isEnabled() {

+		return true;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean isHandled() {

+		return true;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void removeHandlerListener(IHandlerListener handlerListener) {

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdater.java
index 01843eb0e15..fac5229247b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdater.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramUpdater.java
@@ -1,15015 +1,12148 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.part;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.gmf.runtime.emf.core.util.CrossReferenceAdapter;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.update.DiagramUpdater;
-import org.eclipse.papyrus.uml.diagram.common.part.ICustomDiagramUpdater;
-import org.eclipse.papyrus.uml.diagram.composite.custom.parts.PropertyDiagramUpdater;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.*;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.uml2.uml.Abstraction;
-import org.eclipse.uml2.uml.Activity;
-import org.eclipse.uml2.uml.Actor;
-import org.eclipse.uml2.uml.AnyReceiveEvent;
-import org.eclipse.uml2.uml.Artifact;
-import org.eclipse.uml2.uml.CallEvent;
-import org.eclipse.uml2.uml.ChangeEvent;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Classifier;
-import org.eclipse.uml2.uml.Collaboration;
-import org.eclipse.uml2.uml.CollaborationUse;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.uml2.uml.Component;
-import org.eclipse.uml2.uml.ComponentRealization;
-import org.eclipse.uml2.uml.ConnectableElement;
-import org.eclipse.uml2.uml.Connector;
-import org.eclipse.uml2.uml.ConnectorEnd;
-import org.eclipse.uml2.uml.Constraint;
-import org.eclipse.uml2.uml.DataType;
-import org.eclipse.uml2.uml.Dependency;
-import org.eclipse.uml2.uml.Deployment;
-import org.eclipse.uml2.uml.DeploymentSpecification;
-import org.eclipse.uml2.uml.Device;
-import org.eclipse.uml2.uml.Duration;
-import org.eclipse.uml2.uml.DurationConstraint;
-import org.eclipse.uml2.uml.DurationInterval;
-import org.eclipse.uml2.uml.DurationObservation;
-import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.Enumeration;
-import org.eclipse.uml2.uml.EnumerationLiteral;
-import org.eclipse.uml2.uml.ExecutionEnvironment;
-import org.eclipse.uml2.uml.Expression;
-import org.eclipse.uml2.uml.FunctionBehavior;
-import org.eclipse.uml2.uml.Generalization;
-import org.eclipse.uml2.uml.InformationFlow;
-import org.eclipse.uml2.uml.InformationItem;
-import org.eclipse.uml2.uml.InstanceValue;
-import org.eclipse.uml2.uml.Interaction;
-import org.eclipse.uml2.uml.InteractionConstraint;
-import org.eclipse.uml2.uml.Interface;
-import org.eclipse.uml2.uml.InterfaceRealization;
-import org.eclipse.uml2.uml.Interval;
-import org.eclipse.uml2.uml.IntervalConstraint;
-import org.eclipse.uml2.uml.LiteralBoolean;
-import org.eclipse.uml2.uml.LiteralInteger;
-import org.eclipse.uml2.uml.LiteralNull;
-import org.eclipse.uml2.uml.LiteralString;
-import org.eclipse.uml2.uml.LiteralUnlimitedNatural;
-import org.eclipse.uml2.uml.Manifestation;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.Node;
-import org.eclipse.uml2.uml.OpaqueBehavior;
-import org.eclipse.uml2.uml.OpaqueExpression;
-import org.eclipse.uml2.uml.Operation;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.PackageableElement;
-import org.eclipse.uml2.uml.Parameter;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.PrimitiveType;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.ProtocolStateMachine;
-import org.eclipse.uml2.uml.Realization;
-import org.eclipse.uml2.uml.Signal;
-import org.eclipse.uml2.uml.SignalEvent;
-import org.eclipse.uml2.uml.StateMachine;
-import org.eclipse.uml2.uml.StringExpression;
-import org.eclipse.uml2.uml.StructuredClassifier;
-import org.eclipse.uml2.uml.Substitution;
-import org.eclipse.uml2.uml.TimeConstraint;
-import org.eclipse.uml2.uml.TimeEvent;
-import org.eclipse.uml2.uml.TimeExpression;
-import org.eclipse.uml2.uml.TimeInterval;
-import org.eclipse.uml2.uml.TimeObservation;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.eclipse.uml2.uml.Usage;
-import org.eclipse.uml2.uml.UseCase;
-
-/**
- * @generated
- */
-public class UMLDiagramUpdater {
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getSemanticChildren(View view) {
-		switch (UMLVisualIDRegistry.getVisualID(view)) {
-		case CompositeStructureDiagramEditPart.VISUAL_ID:
-			return getPackage_1000SemanticChildren(view);
-		case ActivityCompositeEditPart.VISUAL_ID:
-			return getActivity_2060SemanticChildren(view);
-		case InteractionCompositeEditPart.VISUAL_ID:
-			return getInteraction_2061SemanticChildren(view);
-		case ProtocolStateMachineCompositeEditPart.VISUAL_ID:
-			return getProtocolStateMachine_2062SemanticChildren(view);
-		case StateMachineCompositeEditPart.VISUAL_ID:
-			return getStateMachine_2063SemanticChildren(view);
-		case FunctionBehaviorCompositeEditPart.VISUAL_ID:
-			return getFunctionBehavior_2064SemanticChildren(view);
-		case OpaqueBehaviorCompositeEditPart.VISUAL_ID:
-			return getOpaqueBehavior_2065SemanticChildren(view);
-		case ComponentCompositeEditPart.VISUAL_ID:
-			return getComponent_2069SemanticChildren(view);
-		case DeviceCompositeEditPart.VISUAL_ID:
-			return getDevice_2070SemanticChildren(view);
-		case ExecutionEnvironmentCompositeEditPart.VISUAL_ID:
-			return getExecutionEnvironment_2071SemanticChildren(view);
-		case NodeCompositeEditPart.VISUAL_ID:
-			return getNode_2072SemanticChildren(view);
-		case ClassCompositeEditPart.VISUAL_ID:
-			return getClass_2073SemanticChildren(view);
-		case EnumerationEditPart.VISUAL_ID:
-			return getEnumeration_2067SemanticChildren(view);
-		case PropertyPartEditPartCN.VISUAL_ID:
-			return getProperty_3070SemanticChildren(view);
-		case ActivityCompositeEditPartCN.VISUAL_ID:
-			return getActivity_3072SemanticChildren(view);
-		case InteractionCompositeEditPartCN.VISUAL_ID:
-			return getInteraction_3073SemanticChildren(view);
-		case ProtocolStateMachineCompositeEditPartCN.VISUAL_ID:
-			return getProtocolStateMachine_3074SemanticChildren(view);
-		case StateMachineCompositeEditPartCN.VISUAL_ID:
-			return getStateMachine_3075SemanticChildren(view);
-		case FunctionBehaviorCompositeEditPartCN.VISUAL_ID:
-			return getFunctionBehavior_3076SemanticChildren(view);
-		case OpaqueBehaviorCompositeEditPartCN.VISUAL_ID:
-			return getOpaqueBehavior_3077SemanticChildren(view);
-		case ComponentCompositeEditPartCN.VISUAL_ID:
-			return getComponent_3081SemanticChildren(view);
-		case DeviceCompositeEditPartCN.VISUAL_ID:
-			return getDevice_3082SemanticChildren(view);
-		case ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID:
-			return getExecutionEnvironment_3083SemanticChildren(view);
-		case NodeCompositeEditPartCN.VISUAL_ID:
-			return getNode_3084SemanticChildren(view);
-		case ClassCompositeEditPartCN.VISUAL_ID:
-			return getClass_3085SemanticChildren(view);
-		case EnumerationEditPartCN.VISUAL_ID:
-			return getEnumeration_3079SemanticChildren(view);
-		case DataTypeAttributeCompartmentEditPart.VISUAL_ID:
-			return getDataTypeAttributes_7033SemanticChildren(view);
-		case DataTypeOperationCompartmentEditPart.VISUAL_ID:
-			return getDataTypeOperations_7034SemanticChildren(view);
-		case DataTypeAttributeCompartmentEditPartCN.VISUAL_ID:
-			return getDataTypeAttributes_7036SemanticChildren(view);
-		case DataTypeOperationCompartmentEditPartCN.VISUAL_ID:
-			return getDataTypeOperations_7037SemanticChildren(view);
-		case EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID:
-			return getEnumerationLiterals_7048SemanticChildren(view);
-		case EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID:
-			return getEnumerationLiterals_7049SemanticChildren(view);
-		case ActivityCompositeCompartmentEditPartCN.VISUAL_ID:
-			return getActivityInternalstructure_7050SemanticChildren(view);
-		case InteractionCompositeCompartmentEditPartCN.VISUAL_ID:
-			return getInteractionInternalstructure_7051SemanticChildren(view);
-		case ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID:
-			return getProtocolStateMachineInternalstructure_7052SemanticChildren(view);
-		case StateMachineCompositeCompartmentEditPartCN.VISUAL_ID:
-			return getStateMachineInternalstructure_7053SemanticChildren(view);
-		case FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:
-			return getFunctionBehaviorInternalstructure_7054SemanticChildren(view);
-		case OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:
-			return getOpaqueBehaviorInternalstructure_7055SemanticChildren(view);
-		case ComponentCompositeCompartmentEditPartCN.VISUAL_ID:
-			return getComponentInternalstructure_7056SemanticChildren(view);
-		case DeviceCompositeCompartmentEditPartCN.VISUAL_ID:
-			return getDeviceInternalstructure_7057SemanticChildren(view);
-		case ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID:
-			return getExecutionEnvironmentInternalstructure_7058SemanticChildren(view);
-		case NodeCompositeCompartmentEditPartCN.VISUAL_ID:
-			return getNodeInternalstructure_7059SemanticChildren(view);
-		case ClassCompositeCompartmentEditPartCN.VISUAL_ID:
-			return getClassInternalstructure_7060SemanticChildren(view);
-		case CollaborationCompositeCompartmentEditPartCN.VISUAL_ID:
-			return getCollaborationInternalstructure_7061SemanticChildren(view);
-		case ActivityCompositeCompartmentEditPart.VISUAL_ID:
-			return getActivityInternalstructure_7063SemanticChildren(view);
-		case InteractionCompositeCompartmentEditPart.VISUAL_ID:
-			return getInteractionInternalstructure_7064SemanticChildren(view);
-		case ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID:
-			return getProtocolStateMachineInternalstructure_7065SemanticChildren(view);
-		case StateMachineCompositeCompartmentEditPart.VISUAL_ID:
-			return getStateMachineInternalstructure_7066SemanticChildren(view);
-		case FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID:
-			return getFunctionBehaviorInternalstructure_7067SemanticChildren(view);
-		case OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID:
-			return getOpaqueBehaviorInternalstructure_7068SemanticChildren(view);
-		case ComponentCompositeCompartmentEditPart.VISUAL_ID:
-			return getComponentInternalstructure_7069SemanticChildren(view);
-		case DeviceCompositeCompartmentEditPart.VISUAL_ID:
-			return getDeviceInternalstructure_7070SemanticChildren(view);
-		case ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID:
-			return getExecutionEnvironmentInternalstructure_7071SemanticChildren(view);
-		case NodeCompositeCompartmentEditPart.VISUAL_ID:
-			return getNodeInternalstructure_7072SemanticChildren(view);
-		case ClassCompositeCompartmentEditPart.VISUAL_ID:
-			return getClassInternalstructure_7073SemanticChildren(view);
-		case CollaborationCompositeCompartmentEditPart.VISUAL_ID:
-			return getCollaborationInternalstructure_7075SemanticChildren(view);
-		case PropertyPartCompartmentEditPartCN.VISUAL_ID:
-			return getPropertyInternalstructure_7077SemanticChildren(view);
-		}
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getPackage_1000SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Package modelElement = (Package) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getPackagedElements()
-				.iterator(); it.hasNext();) {
-			PackageableElement childElement = (PackageableElement) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ActivityCompositeEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionCompositeEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ProtocolStateMachineCompositeEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == StateMachineCompositeEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == FunctionBehaviorCompositeEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == OpaqueBehaviorCompositeEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ComponentCompositeEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeviceCompositeEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ExecutionEnvironmentCompositeEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == NodeCompositeEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ClassCompositeEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == CollaborationCompositeEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InterfaceEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == PrimitiveTypeEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == EnumerationEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DataTypeEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ActorEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeploymentSpecificationEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ArtifactEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InformationItemEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == SignalEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == UseCaseEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == SignalEventEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == CallEventEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == AnyReceiveEventEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ChangeEventEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeEventEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DurationObservationEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeObservationEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == LiteralBooleanEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == LiteralIntegerEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == LiteralNullEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == LiteralStringEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == LiteralUnlimitedNaturalEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == StringExpressionEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == OpaqueExpressionEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeExpressionEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ExpressionEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DurationEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeIntervalEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DurationIntervalEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == IntervalEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InstanceValueEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments()
-				.iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CommentEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules()
-				.iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == DurationConstraintEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeConstraintEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == IntervalConstraintEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionConstraintEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ConstraintEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getActivity_2060SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Activity modelElement = (Activity) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PortEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedParameters()
-				.iterator(); it.hasNext();) {
-			Parameter childElement = (Parameter) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ParameterEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getInteraction_2061SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Interaction modelElement = (Interaction) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PortEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedParameters()
-				.iterator(); it.hasNext();) {
-			Parameter childElement = (Parameter) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ParameterEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getProtocolStateMachine_2062SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PortEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedParameters()
-				.iterator(); it.hasNext();) {
-			Parameter childElement = (Parameter) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ParameterEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getStateMachine_2063SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		StateMachine modelElement = (StateMachine) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PortEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedParameters()
-				.iterator(); it.hasNext();) {
-			Parameter childElement = (Parameter) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ParameterEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getFunctionBehavior_2064SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PortEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedParameters()
-				.iterator(); it.hasNext();) {
-			Parameter childElement = (Parameter) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ParameterEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getOpaqueBehavior_2065SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PortEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedParameters()
-				.iterator(); it.hasNext();) {
-			Parameter childElement = (Parameter) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ParameterEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getComponent_2069SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Component modelElement = (Component) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PortEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getDevice_2070SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Device modelElement = (Device) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PortEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getExecutionEnvironment_2071SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PortEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getNode_2072SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Node modelElement = (Node) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PortEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getClass_2073SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Class modelElement = (Class) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PortEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getEnumeration_2067SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Enumeration modelElement = (Enumeration) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedLiterals()
-				.iterator(); it.hasNext();) {
-			EnumerationLiteral childElement = (EnumerationLiteral) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == EnumerationLiteralEditPartCLN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getProperty_3070SemanticChildren(View view) {
-		ICustomDiagramUpdater<UMLNodeDescriptor> customUpdater = new PropertyDiagramUpdater();
-		return customUpdater.getSemanticChildren(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getActivity_3072SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Activity modelElement = (Activity) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PortEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedParameters()
-				.iterator(); it.hasNext();) {
-			Parameter childElement = (Parameter) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ParameterEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getInteraction_3073SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Interaction modelElement = (Interaction) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PortEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedParameters()
-				.iterator(); it.hasNext();) {
-			Parameter childElement = (Parameter) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ParameterEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getProtocolStateMachine_3074SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PortEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedParameters()
-				.iterator(); it.hasNext();) {
-			Parameter childElement = (Parameter) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ParameterEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getStateMachine_3075SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		StateMachine modelElement = (StateMachine) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PortEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedParameters()
-				.iterator(); it.hasNext();) {
-			Parameter childElement = (Parameter) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ParameterEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getFunctionBehavior_3076SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PortEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedParameters()
-				.iterator(); it.hasNext();) {
-			Parameter childElement = (Parameter) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ParameterEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getOpaqueBehavior_3077SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PortEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedParameters()
-				.iterator(); it.hasNext();) {
-			Parameter childElement = (Parameter) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ParameterEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getComponent_3081SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Component modelElement = (Component) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PortEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getDevice_3082SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Device modelElement = (Device) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PortEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getExecutionEnvironment_3083SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PortEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getNode_3084SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Node modelElement = (Node) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PortEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getClass_3085SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Class modelElement = (Class) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PortEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getEnumeration_3079SemanticChildren(View view) {
-		if (!view.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Enumeration modelElement = (Enumeration) view.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedLiterals()
-				.iterator(); it.hasNext();) {
-			EnumerationLiteral childElement = (EnumerationLiteral) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == EnumerationLiteralEditPartCLN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getDataTypeAttributes_7033SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		DataType modelElement = (DataType) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PropertyEditPartCLN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getDataTypeOperations_7034SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		DataType modelElement = (DataType) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedOperations()
-				.iterator(); it.hasNext();) {
-			Operation childElement = (Operation) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == OperationEditPartCLN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getDataTypeAttributes_7036SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		DataType modelElement = (DataType) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PropertyEditPartCLN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getDataTypeOperations_7037SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		DataType modelElement = (DataType) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedOperations()
-				.iterator(); it.hasNext();) {
-			Operation childElement = (Operation) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == OperationEditPartCLN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getEnumerationLiterals_7048SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Enumeration modelElement = (Enumeration) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedLiterals()
-				.iterator(); it.hasNext();) {
-			EnumerationLiteral childElement = (EnumerationLiteral) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == EnumerationLiteralEditPartCLN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getEnumerationLiterals_7049SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Enumeration modelElement = (Enumeration) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedLiterals()
-				.iterator(); it.hasNext();) {
-			EnumerationLiteral childElement = (EnumerationLiteral) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == EnumerationLiteralEditPartCLN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getActivityInternalstructure_7050SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Activity modelElement = (Activity) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedParameters()
-				.iterator(); it.hasNext();) {
-			Parameter childElement = (Parameter) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ParameterEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getCollaborationUses()
-				.iterator(); it.hasNext();) {
-			CollaborationUse childElement = (CollaborationUse) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getNestedClassifiers()
-				.iterator(); it.hasNext();) {
-			Classifier childElement = (Classifier) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ActorEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == SignalEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments()
-				.iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CommentEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules()
-				.iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getInteractionInternalstructure_7051SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Interaction modelElement = (Interaction) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedParameters()
-				.iterator(); it.hasNext();) {
-			Parameter childElement = (Parameter) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ParameterEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getCollaborationUses()
-				.iterator(); it.hasNext();) {
-			CollaborationUse childElement = (CollaborationUse) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getNestedClassifiers()
-				.iterator(); it.hasNext();) {
-			Classifier childElement = (Classifier) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ActorEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == SignalEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments()
-				.iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CommentEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules()
-				.iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getProtocolStateMachineInternalstructure_7052SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		ProtocolStateMachine modelElement = (ProtocolStateMachine) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedParameters()
-				.iterator(); it.hasNext();) {
-			Parameter childElement = (Parameter) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ParameterEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getCollaborationUses()
-				.iterator(); it.hasNext();) {
-			CollaborationUse childElement = (CollaborationUse) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getNestedClassifiers()
-				.iterator(); it.hasNext();) {
-			Classifier childElement = (Classifier) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ActorEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == SignalEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments()
-				.iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CommentEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules()
-				.iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getStateMachineInternalstructure_7053SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		StateMachine modelElement = (StateMachine) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedParameters()
-				.iterator(); it.hasNext();) {
-			Parameter childElement = (Parameter) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ParameterEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getCollaborationUses()
-				.iterator(); it.hasNext();) {
-			CollaborationUse childElement = (CollaborationUse) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getNestedClassifiers()
-				.iterator(); it.hasNext();) {
-			Classifier childElement = (Classifier) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ActorEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == SignalEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments()
-				.iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CommentEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules()
-				.iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getFunctionBehaviorInternalstructure_7054SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		FunctionBehavior modelElement = (FunctionBehavior) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedParameters()
-				.iterator(); it.hasNext();) {
-			Parameter childElement = (Parameter) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ParameterEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getCollaborationUses()
-				.iterator(); it.hasNext();) {
-			CollaborationUse childElement = (CollaborationUse) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getNestedClassifiers()
-				.iterator(); it.hasNext();) {
-			Classifier childElement = (Classifier) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ActorEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == SignalEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments()
-				.iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CommentEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules()
-				.iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getOpaqueBehaviorInternalstructure_7055SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		OpaqueBehavior modelElement = (OpaqueBehavior) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedParameters()
-				.iterator(); it.hasNext();) {
-			Parameter childElement = (Parameter) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ParameterEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getCollaborationUses()
-				.iterator(); it.hasNext();) {
-			CollaborationUse childElement = (CollaborationUse) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getNestedClassifiers()
-				.iterator(); it.hasNext();) {
-			Classifier childElement = (Classifier) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ActorEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == SignalEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments()
-				.iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CommentEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules()
-				.iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getComponentInternalstructure_7056SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Component modelElement = (Component) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getCollaborationUses()
-				.iterator(); it.hasNext();) {
-			CollaborationUse childElement = (CollaborationUse) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getNestedClassifiers()
-				.iterator(); it.hasNext();) {
-			Classifier childElement = (Classifier) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ActorEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == SignalEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments()
-				.iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CommentEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules()
-				.iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getDeviceInternalstructure_7057SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Device modelElement = (Device) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getCollaborationUses()
-				.iterator(); it.hasNext();) {
-			CollaborationUse childElement = (CollaborationUse) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getNestedClassifiers()
-				.iterator(); it.hasNext();) {
-			Classifier childElement = (Classifier) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ActorEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == SignalEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments()
-				.iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CommentEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules()
-				.iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getExecutionEnvironmentInternalstructure_7058SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		ExecutionEnvironment modelElement = (ExecutionEnvironment) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getCollaborationUses()
-				.iterator(); it.hasNext();) {
-			CollaborationUse childElement = (CollaborationUse) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getNestedClassifiers()
-				.iterator(); it.hasNext();) {
-			Classifier childElement = (Classifier) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ActorEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == SignalEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments()
-				.iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CommentEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules()
-				.iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getNodeInternalstructure_7059SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Node modelElement = (Node) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getCollaborationUses()
-				.iterator(); it.hasNext();) {
-			CollaborationUse childElement = (CollaborationUse) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getNestedClassifiers()
-				.iterator(); it.hasNext();) {
-			Classifier childElement = (Classifier) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ActorEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == SignalEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments()
-				.iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CommentEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules()
-				.iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getClassInternalstructure_7060SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Class modelElement = (Class) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getCollaborationUses()
-				.iterator(); it.hasNext();) {
-			CollaborationUse childElement = (CollaborationUse) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getNestedClassifiers()
-				.iterator(); it.hasNext();) {
-			Classifier childElement = (Classifier) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ActorEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == SignalEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments()
-				.iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CommentEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules()
-				.iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getCollaborationInternalstructure_7061SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Collaboration modelElement = (Collaboration) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getCollaborationUses()
-				.iterator(); it.hasNext();) {
-			CollaborationUse childElement = (CollaborationUse) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments()
-				.iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CommentEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getRoles()
-				.iterator(); it.hasNext();) {
-			ConnectableElement childElement = (ConnectableElement) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CollaborationRoleEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules()
-				.iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getActivityInternalstructure_7063SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Activity modelElement = (Activity) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedParameters()
-				.iterator(); it.hasNext();) {
-			Parameter childElement = (Parameter) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ParameterEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getCollaborationUses()
-				.iterator(); it.hasNext();) {
-			CollaborationUse childElement = (CollaborationUse) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getNestedClassifiers()
-				.iterator(); it.hasNext();) {
-			Classifier childElement = (Classifier) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ActorEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == SignalEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments()
-				.iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CommentEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules()
-				.iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getInteractionInternalstructure_7064SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Interaction modelElement = (Interaction) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedParameters()
-				.iterator(); it.hasNext();) {
-			Parameter childElement = (Parameter) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ParameterEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getCollaborationUses()
-				.iterator(); it.hasNext();) {
-			CollaborationUse childElement = (CollaborationUse) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getNestedClassifiers()
-				.iterator(); it.hasNext();) {
-			Classifier childElement = (Classifier) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ActorEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == SignalEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments()
-				.iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CommentEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules()
-				.iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getProtocolStateMachineInternalstructure_7065SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		ProtocolStateMachine modelElement = (ProtocolStateMachine) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedParameters()
-				.iterator(); it.hasNext();) {
-			Parameter childElement = (Parameter) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ParameterEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getCollaborationUses()
-				.iterator(); it.hasNext();) {
-			CollaborationUse childElement = (CollaborationUse) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getNestedClassifiers()
-				.iterator(); it.hasNext();) {
-			Classifier childElement = (Classifier) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ActorEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == SignalEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments()
-				.iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CommentEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules()
-				.iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getStateMachineInternalstructure_7066SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		StateMachine modelElement = (StateMachine) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedParameters()
-				.iterator(); it.hasNext();) {
-			Parameter childElement = (Parameter) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ParameterEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getCollaborationUses()
-				.iterator(); it.hasNext();) {
-			CollaborationUse childElement = (CollaborationUse) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getNestedClassifiers()
-				.iterator(); it.hasNext();) {
-			Classifier childElement = (Classifier) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ActorEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == SignalEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments()
-				.iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CommentEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules()
-				.iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getFunctionBehaviorInternalstructure_7067SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		FunctionBehavior modelElement = (FunctionBehavior) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedParameters()
-				.iterator(); it.hasNext();) {
-			Parameter childElement = (Parameter) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ParameterEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getCollaborationUses()
-				.iterator(); it.hasNext();) {
-			CollaborationUse childElement = (CollaborationUse) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getNestedClassifiers()
-				.iterator(); it.hasNext();) {
-			Classifier childElement = (Classifier) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ActorEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == SignalEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments()
-				.iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CommentEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules()
-				.iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getOpaqueBehaviorInternalstructure_7068SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		OpaqueBehavior modelElement = (OpaqueBehavior) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedParameters()
-				.iterator(); it.hasNext();) {
-			Parameter childElement = (Parameter) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ParameterEditPart.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getCollaborationUses()
-				.iterator(); it.hasNext();) {
-			CollaborationUse childElement = (CollaborationUse) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getNestedClassifiers()
-				.iterator(); it.hasNext();) {
-			Classifier childElement = (Classifier) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ActorEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == SignalEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments()
-				.iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CommentEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules()
-				.iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getComponentInternalstructure_7069SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Component modelElement = (Component) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getCollaborationUses()
-				.iterator(); it.hasNext();) {
-			CollaborationUse childElement = (CollaborationUse) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getNestedClassifiers()
-				.iterator(); it.hasNext();) {
-			Classifier childElement = (Classifier) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ActorEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == SignalEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments()
-				.iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CommentEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules()
-				.iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getDeviceInternalstructure_7070SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Device modelElement = (Device) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getCollaborationUses()
-				.iterator(); it.hasNext();) {
-			CollaborationUse childElement = (CollaborationUse) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getNestedClassifiers()
-				.iterator(); it.hasNext();) {
-			Classifier childElement = (Classifier) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ActorEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == SignalEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments()
-				.iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CommentEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules()
-				.iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getExecutionEnvironmentInternalstructure_7071SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		ExecutionEnvironment modelElement = (ExecutionEnvironment) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getCollaborationUses()
-				.iterator(); it.hasNext();) {
-			CollaborationUse childElement = (CollaborationUse) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getNestedClassifiers()
-				.iterator(); it.hasNext();) {
-			Classifier childElement = (Classifier) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ActorEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == SignalEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments()
-				.iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CommentEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules()
-				.iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getNodeInternalstructure_7072SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Node modelElement = (Node) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getCollaborationUses()
-				.iterator(); it.hasNext();) {
-			CollaborationUse childElement = (CollaborationUse) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getNestedClassifiers()
-				.iterator(); it.hasNext();) {
-			Classifier childElement = (Classifier) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ActorEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == SignalEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments()
-				.iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CommentEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules()
-				.iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getClassInternalstructure_7073SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Class modelElement = (Class) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getCollaborationUses()
-				.iterator(); it.hasNext();) {
-			CollaborationUse childElement = (CollaborationUse) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getNestedClassifiers()
-				.iterator(); it.hasNext();) {
-			Classifier childElement = (Classifier) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ActivityCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ComponentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeviceCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == NodeCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ClassCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InterfaceEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == EnumerationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DataTypeEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ActorEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ArtifactEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InformationItemEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == SignalEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == UseCaseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments()
-				.iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CommentEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules()
-				.iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getCollaborationInternalstructure_7075SemanticChildren(View view) {
-		if (false == view.eContainer() instanceof View) {
-			return Collections.emptyList();
-		}
-		View containerView = (View) view.eContainer();
-		if (!containerView.isSetElement()) {
-			return Collections.emptyList();
-		}
-		Collaboration modelElement = (Collaboration) containerView.getElement();
-		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();
-		for (Iterator<?> it = modelElement.getOwnedAttributes()
-				.iterator(); it.hasNext();) {
-			Property childElement = (Property) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == PropertyPartEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getCollaborationUses()
-				.iterator(); it.hasNext();) {
-			CollaborationUse childElement = (CollaborationUse) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CollaborationUseEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedComments()
-				.iterator(); it.hasNext();) {
-			Comment childElement = (Comment) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CommentEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getRoles()
-				.iterator(); it.hasNext();) {
-			ConnectableElement childElement = (ConnectableElement) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == CollaborationRoleEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		for (Iterator<?> it = modelElement.getOwnedRules()
-				.iterator(); it.hasNext();) {
-			Constraint childElement = (Constraint) it.next();
-			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);
-			if (visualID == DurationConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == TimeConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == IntervalConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == InteractionConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-			if (visualID == ConstraintEditPartCN.VISUAL_ID) {
-				result.add(new UMLNodeDescriptor(childElement, visualID));
-				continue;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLNodeDescriptor> getPropertyInternalstructure_7077SemanticChildren(View view) {
-		ICustomDiagramUpdater<UMLNodeDescriptor> customUpdater = new PropertyDiagramUpdater();
-		return customUpdater.getSemanticChildren(view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getContainedLinks(View view) {
-		switch (UMLVisualIDRegistry.getVisualID(view)) {
-		case CompositeStructureDiagramEditPart.VISUAL_ID:
-			return getPackage_1000ContainedLinks(view);
-		case ActivityCompositeEditPart.VISUAL_ID:
-			return getActivity_2060ContainedLinks(view);
-		case InteractionCompositeEditPart.VISUAL_ID:
-			return getInteraction_2061ContainedLinks(view);
-		case ProtocolStateMachineCompositeEditPart.VISUAL_ID:
-			return getProtocolStateMachine_2062ContainedLinks(view);
-		case StateMachineCompositeEditPart.VISUAL_ID:
-			return getStateMachine_2063ContainedLinks(view);
-		case FunctionBehaviorCompositeEditPart.VISUAL_ID:
-			return getFunctionBehavior_2064ContainedLinks(view);
-		case OpaqueBehaviorCompositeEditPart.VISUAL_ID:
-			return getOpaqueBehavior_2065ContainedLinks(view);
-		case ComponentCompositeEditPart.VISUAL_ID:
-			return getComponent_2069ContainedLinks(view);
-		case DeviceCompositeEditPart.VISUAL_ID:
-			return getDevice_2070ContainedLinks(view);
-		case ExecutionEnvironmentCompositeEditPart.VISUAL_ID:
-			return getExecutionEnvironment_2071ContainedLinks(view);
-		case NodeCompositeEditPart.VISUAL_ID:
-			return getNode_2072ContainedLinks(view);
-		case ClassCompositeEditPart.VISUAL_ID:
-			return getClass_2073ContainedLinks(view);
-		case CollaborationCompositeEditPart.VISUAL_ID:
-			return getCollaboration_2075ContainedLinks(view);
-		case InterfaceEditPart.VISUAL_ID:
-			return getInterface_2076ContainedLinks(view);
-		case PrimitiveTypeEditPart.VISUAL_ID:
-			return getPrimitiveType_2066ContainedLinks(view);
-		case EnumerationEditPart.VISUAL_ID:
-			return getEnumeration_2067ContainedLinks(view);
-		case DataTypeEditPart.VISUAL_ID:
-			return getDataType_2068ContainedLinks(view);
-		case ActorEditPart.VISUAL_ID:
-			return getActor_2077ContainedLinks(view);
-		case DeploymentSpecificationEditPart.VISUAL_ID:
-			return getDeploymentSpecification_2078ContainedLinks(view);
-		case ArtifactEditPart.VISUAL_ID:
-			return getArtifact_2079ContainedLinks(view);
-		case InformationItemEditPart.VISUAL_ID:
-			return getInformationItem_2080ContainedLinks(view);
-		case SignalEditPart.VISUAL_ID:
-			return getSignal_2081ContainedLinks(view);
-		case UseCaseEditPart.VISUAL_ID:
-			return getUseCase_2082ContainedLinks(view);
-		case SignalEventEditPart.VISUAL_ID:
-			return getSignalEvent_2083ContainedLinks(view);
-		case CallEventEditPart.VISUAL_ID:
-			return getCallEvent_2084ContainedLinks(view);
-		case AnyReceiveEventEditPart.VISUAL_ID:
-			return getAnyReceiveEvent_2085ContainedLinks(view);
-		case ChangeEventEditPart.VISUAL_ID:
-			return getChangeEvent_2088ContainedLinks(view);
-		case TimeEventEditPart.VISUAL_ID:
-			return getTimeEvent_2089ContainedLinks(view);
-		case DurationObservationEditPart.VISUAL_ID:
-			return getDurationObservation_2093ContainedLinks(view);
-		case TimeObservationEditPart.VISUAL_ID:
-			return getTimeObservation_2094ContainedLinks(view);
-		case LiteralBooleanEditPart.VISUAL_ID:
-			return getLiteralBoolean_2095ContainedLinks(view);
-		case LiteralIntegerEditPart.VISUAL_ID:
-			return getLiteralInteger_2096ContainedLinks(view);
-		case LiteralNullEditPart.VISUAL_ID:
-			return getLiteralNull_2097ContainedLinks(view);
-		case LiteralStringEditPart.VISUAL_ID:
-			return getLiteralString_2098ContainedLinks(view);
-		case LiteralUnlimitedNaturalEditPart.VISUAL_ID:
-			return getLiteralUnlimitedNatural_2099ContainedLinks(view);
-		case StringExpressionEditPart.VISUAL_ID:
-			return getStringExpression_2100ContainedLinks(view);
-		case OpaqueExpressionEditPart.VISUAL_ID:
-			return getOpaqueExpression_2101ContainedLinks(view);
-		case TimeExpressionEditPart.VISUAL_ID:
-			return getTimeExpression_2102ContainedLinks(view);
-		case ExpressionEditPart.VISUAL_ID:
-			return getExpression_2103ContainedLinks(view);
-		case DurationEditPart.VISUAL_ID:
-			return getDuration_2104ContainedLinks(view);
-		case TimeIntervalEditPart.VISUAL_ID:
-			return getTimeInterval_2105ContainedLinks(view);
-		case DurationIntervalEditPart.VISUAL_ID:
-			return getDurationInterval_2106ContainedLinks(view);
-		case IntervalEditPart.VISUAL_ID:
-			return getInterval_2107ContainedLinks(view);
-		case InstanceValueEditPart.VISUAL_ID:
-			return getInstanceValue_2108ContainedLinks(view);
-		case CommentEditPart.VISUAL_ID:
-			return getComment_2109ContainedLinks(view);
-		case DurationConstraintEditPart.VISUAL_ID:
-			return getDurationConstraint_2110ContainedLinks(view);
-		case TimeConstraintEditPart.VISUAL_ID:
-			return getTimeConstraint_2111ContainedLinks(view);
-		case IntervalConstraintEditPart.VISUAL_ID:
-			return getIntervalConstraint_2112ContainedLinks(view);
-		case InteractionConstraintEditPart.VISUAL_ID:
-			return getInteractionConstraint_2113ContainedLinks(view);
-		case ConstraintEditPart.VISUAL_ID:
-			return getConstraint_2114ContainedLinks(view);
-		case PortEditPart.VISUAL_ID:
-			return getPort_3069ContainedLinks(view);
-		case ParameterEditPart.VISUAL_ID:
-			return getParameter_3088ContainedLinks(view);
-		case PropertyPartEditPartCN.VISUAL_ID:
-			return getProperty_3070ContainedLinks(view);
-		case CollaborationRoleEditPartCN.VISUAL_ID:
-			return getConnectableElement_3115ContainedLinks(view);
-		case CollaborationUseEditPartCN.VISUAL_ID:
-			return getCollaborationUse_3071ContainedLinks(view);
-		case ActivityCompositeEditPartCN.VISUAL_ID:
-			return getActivity_3072ContainedLinks(view);
-		case InteractionCompositeEditPartCN.VISUAL_ID:
-			return getInteraction_3073ContainedLinks(view);
-		case ProtocolStateMachineCompositeEditPartCN.VISUAL_ID:
-			return getProtocolStateMachine_3074ContainedLinks(view);
-		case StateMachineCompositeEditPartCN.VISUAL_ID:
-			return getStateMachine_3075ContainedLinks(view);
-		case FunctionBehaviorCompositeEditPartCN.VISUAL_ID:
-			return getFunctionBehavior_3076ContainedLinks(view);
-		case OpaqueBehaviorCompositeEditPartCN.VISUAL_ID:
-			return getOpaqueBehavior_3077ContainedLinks(view);
-		case ComponentCompositeEditPartCN.VISUAL_ID:
-			return getComponent_3081ContainedLinks(view);
-		case DeviceCompositeEditPartCN.VISUAL_ID:
-			return getDevice_3082ContainedLinks(view);
-		case ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID:
-			return getExecutionEnvironment_3083ContainedLinks(view);
-		case NodeCompositeEditPartCN.VISUAL_ID:
-			return getNode_3084ContainedLinks(view);
-		case ClassCompositeEditPartCN.VISUAL_ID:
-			return getClass_3085ContainedLinks(view);
-		case CollaborationCompositeEditPartCN.VISUAL_ID:
-			return getCollaboration_3086ContainedLinks(view);
-		case InterfaceEditPartCN.VISUAL_ID:
-			return getInterface_3087ContainedLinks(view);
-		case PrimitiveTypeEditPartCN.VISUAL_ID:
-			return getPrimitiveType_3078ContainedLinks(view);
-		case EnumerationEditPartCN.VISUAL_ID:
-			return getEnumeration_3079ContainedLinks(view);
-		case DataTypeEditPartCN.VISUAL_ID:
-			return getDataType_3080ContainedLinks(view);
-		case ActorEditPartCN.VISUAL_ID:
-			return getActor_3091ContainedLinks(view);
-		case DeploymentSpecificationEditPartCN.VISUAL_ID:
-			return getDeploymentSpecification_3092ContainedLinks(view);
-		case ArtifactEditPartCN.VISUAL_ID:
-			return getArtifact_3093ContainedLinks(view);
-		case InformationItemEditPartCN.VISUAL_ID:
-			return getInformationItem_3094ContainedLinks(view);
-		case SignalEditPartCN.VISUAL_ID:
-			return getSignal_3095ContainedLinks(view);
-		case UseCaseEditPartCN.VISUAL_ID:
-			return getUseCase_3096ContainedLinks(view);
-		case CommentEditPartCN.VISUAL_ID:
-			return getComment_3097ContainedLinks(view);
-		case DurationConstraintEditPartCN.VISUAL_ID:
-			return getDurationConstraint_3116ContainedLinks(view);
-		case TimeConstraintEditPartCN.VISUAL_ID:
-			return getTimeConstraint_3117ContainedLinks(view);
-		case IntervalConstraintEditPartCN.VISUAL_ID:
-			return getIntervalConstraint_3118ContainedLinks(view);
-		case InteractionConstraintEditPartCN.VISUAL_ID:
-			return getInteractionConstraint_3119ContainedLinks(view);
-		case ConstraintEditPartCN.VISUAL_ID:
-			return getConstraint_3120ContainedLinks(view);
-		case PropertyEditPartCLN.VISUAL_ID:
-			return getProperty_3101ContainedLinks(view);
-		case OperationEditPartCLN.VISUAL_ID:
-			return getOperation_3102ContainedLinks(view);
-		case EnumerationLiteralEditPartCLN.VISUAL_ID:
-			return getEnumerationLiteral_3066ContainedLinks(view);
-		case ComponentRealizationEditPart.VISUAL_ID:
-			return getComponentRealization_4004ContainedLinks(view);
-		case InterfaceRealizationEditPart.VISUAL_ID:
-			return getInterfaceRealization_4005ContainedLinks(view);
-		case SubstitutionEditPart.VISUAL_ID:
-			return getSubstitution_4011ContainedLinks(view);
-		case RealizationEditPart.VISUAL_ID:
-			return getRealization_4006ContainedLinks(view);
-		case ManifestationEditPart.VISUAL_ID:
-			return getManifestation_4012ContainedLinks(view);
-		case AbstractionEditPart.VISUAL_ID:
-			return getAbstraction_4007ContainedLinks(view);
-		case UsageEditPart.VISUAL_ID:
-			return getUsage_4008ContainedLinks(view);
-		case DeploymentEditPart.VISUAL_ID:
-			return getDeployment_4009ContainedLinks(view);
-		case RoleBindingEditPart.VISUAL_ID:
-			return getDependency_4017ContainedLinks(view);
-		case DependencyEditPart.VISUAL_ID:
-			return getDependency_4010ContainedLinks(view);
-		case ConnectorEditPart.VISUAL_ID:
-			return getConnector_4013ContainedLinks(view);
-		case GeneralizationEditPart.VISUAL_ID:
-			return getGeneralization_4015ContainedLinks(view);
-		case InformationFlowEditPart.VISUAL_ID:
-			return getInformationFlow_4021ContainedLinks(view);
-		}
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getIncomingLinks(View view) {
-		switch (UMLVisualIDRegistry.getVisualID(view)) {
-		case ActivityCompositeEditPart.VISUAL_ID:
-			return getActivity_2060IncomingLinks(view);
-		case InteractionCompositeEditPart.VISUAL_ID:
-			return getInteraction_2061IncomingLinks(view);
-		case ProtocolStateMachineCompositeEditPart.VISUAL_ID:
-			return getProtocolStateMachine_2062IncomingLinks(view);
-		case StateMachineCompositeEditPart.VISUAL_ID:
-			return getStateMachine_2063IncomingLinks(view);
-		case FunctionBehaviorCompositeEditPart.VISUAL_ID:
-			return getFunctionBehavior_2064IncomingLinks(view);
-		case OpaqueBehaviorCompositeEditPart.VISUAL_ID:
-			return getOpaqueBehavior_2065IncomingLinks(view);
-		case ComponentCompositeEditPart.VISUAL_ID:
-			return getComponent_2069IncomingLinks(view);
-		case DeviceCompositeEditPart.VISUAL_ID:
-			return getDevice_2070IncomingLinks(view);
-		case ExecutionEnvironmentCompositeEditPart.VISUAL_ID:
-			return getExecutionEnvironment_2071IncomingLinks(view);
-		case NodeCompositeEditPart.VISUAL_ID:
-			return getNode_2072IncomingLinks(view);
-		case ClassCompositeEditPart.VISUAL_ID:
-			return getClass_2073IncomingLinks(view);
-		case CollaborationCompositeEditPart.VISUAL_ID:
-			return getCollaboration_2075IncomingLinks(view);
-		case InterfaceEditPart.VISUAL_ID:
-			return getInterface_2076IncomingLinks(view);
-		case PrimitiveTypeEditPart.VISUAL_ID:
-			return getPrimitiveType_2066IncomingLinks(view);
-		case EnumerationEditPart.VISUAL_ID:
-			return getEnumeration_2067IncomingLinks(view);
-		case DataTypeEditPart.VISUAL_ID:
-			return getDataType_2068IncomingLinks(view);
-		case ActorEditPart.VISUAL_ID:
-			return getActor_2077IncomingLinks(view);
-		case DeploymentSpecificationEditPart.VISUAL_ID:
-			return getDeploymentSpecification_2078IncomingLinks(view);
-		case ArtifactEditPart.VISUAL_ID:
-			return getArtifact_2079IncomingLinks(view);
-		case InformationItemEditPart.VISUAL_ID:
-			return getInformationItem_2080IncomingLinks(view);
-		case SignalEditPart.VISUAL_ID:
-			return getSignal_2081IncomingLinks(view);
-		case UseCaseEditPart.VISUAL_ID:
-			return getUseCase_2082IncomingLinks(view);
-		case SignalEventEditPart.VISUAL_ID:
-			return getSignalEvent_2083IncomingLinks(view);
-		case CallEventEditPart.VISUAL_ID:
-			return getCallEvent_2084IncomingLinks(view);
-		case AnyReceiveEventEditPart.VISUAL_ID:
-			return getAnyReceiveEvent_2085IncomingLinks(view);
-		case ChangeEventEditPart.VISUAL_ID:
-			return getChangeEvent_2088IncomingLinks(view);
-		case TimeEventEditPart.VISUAL_ID:
-			return getTimeEvent_2089IncomingLinks(view);
-		case DurationObservationEditPart.VISUAL_ID:
-			return getDurationObservation_2093IncomingLinks(view);
-		case TimeObservationEditPart.VISUAL_ID:
-			return getTimeObservation_2094IncomingLinks(view);
-		case LiteralBooleanEditPart.VISUAL_ID:
-			return getLiteralBoolean_2095IncomingLinks(view);
-		case LiteralIntegerEditPart.VISUAL_ID:
-			return getLiteralInteger_2096IncomingLinks(view);
-		case LiteralNullEditPart.VISUAL_ID:
-			return getLiteralNull_2097IncomingLinks(view);
-		case LiteralStringEditPart.VISUAL_ID:
-			return getLiteralString_2098IncomingLinks(view);
-		case LiteralUnlimitedNaturalEditPart.VISUAL_ID:
-			return getLiteralUnlimitedNatural_2099IncomingLinks(view);
-		case StringExpressionEditPart.VISUAL_ID:
-			return getStringExpression_2100IncomingLinks(view);
-		case OpaqueExpressionEditPart.VISUAL_ID:
-			return getOpaqueExpression_2101IncomingLinks(view);
-		case TimeExpressionEditPart.VISUAL_ID:
-			return getTimeExpression_2102IncomingLinks(view);
-		case ExpressionEditPart.VISUAL_ID:
-			return getExpression_2103IncomingLinks(view);
-		case DurationEditPart.VISUAL_ID:
-			return getDuration_2104IncomingLinks(view);
-		case TimeIntervalEditPart.VISUAL_ID:
-			return getTimeInterval_2105IncomingLinks(view);
-		case DurationIntervalEditPart.VISUAL_ID:
-			return getDurationInterval_2106IncomingLinks(view);
-		case IntervalEditPart.VISUAL_ID:
-			return getInterval_2107IncomingLinks(view);
-		case InstanceValueEditPart.VISUAL_ID:
-			return getInstanceValue_2108IncomingLinks(view);
-		case CommentEditPart.VISUAL_ID:
-			return getComment_2109IncomingLinks(view);
-		case DurationConstraintEditPart.VISUAL_ID:
-			return getDurationConstraint_2110IncomingLinks(view);
-		case TimeConstraintEditPart.VISUAL_ID:
-			return getTimeConstraint_2111IncomingLinks(view);
-		case IntervalConstraintEditPart.VISUAL_ID:
-			return getIntervalConstraint_2112IncomingLinks(view);
-		case InteractionConstraintEditPart.VISUAL_ID:
-			return getInteractionConstraint_2113IncomingLinks(view);
-		case ConstraintEditPart.VISUAL_ID:
-			return getConstraint_2114IncomingLinks(view);
-		case PortEditPart.VISUAL_ID:
-			return getPort_3069IncomingLinks(view);
-		case ParameterEditPart.VISUAL_ID:
-			return getParameter_3088IncomingLinks(view);
-		case PropertyPartEditPartCN.VISUAL_ID:
-			return getProperty_3070IncomingLinks(view);
-		case CollaborationRoleEditPartCN.VISUAL_ID:
-			return getConnectableElement_3115IncomingLinks(view);
-		case CollaborationUseEditPartCN.VISUAL_ID:
-			return getCollaborationUse_3071IncomingLinks(view);
-		case ActivityCompositeEditPartCN.VISUAL_ID:
-			return getActivity_3072IncomingLinks(view);
-		case InteractionCompositeEditPartCN.VISUAL_ID:
-			return getInteraction_3073IncomingLinks(view);
-		case ProtocolStateMachineCompositeEditPartCN.VISUAL_ID:
-			return getProtocolStateMachine_3074IncomingLinks(view);
-		case StateMachineCompositeEditPartCN.VISUAL_ID:
-			return getStateMachine_3075IncomingLinks(view);
-		case FunctionBehaviorCompositeEditPartCN.VISUAL_ID:
-			return getFunctionBehavior_3076IncomingLinks(view);
-		case OpaqueBehaviorCompositeEditPartCN.VISUAL_ID:
-			return getOpaqueBehavior_3077IncomingLinks(view);
-		case ComponentCompositeEditPartCN.VISUAL_ID:
-			return getComponent_3081IncomingLinks(view);
-		case DeviceCompositeEditPartCN.VISUAL_ID:
-			return getDevice_3082IncomingLinks(view);
-		case ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID:
-			return getExecutionEnvironment_3083IncomingLinks(view);
-		case NodeCompositeEditPartCN.VISUAL_ID:
-			return getNode_3084IncomingLinks(view);
-		case ClassCompositeEditPartCN.VISUAL_ID:
-			return getClass_3085IncomingLinks(view);
-		case CollaborationCompositeEditPartCN.VISUAL_ID:
-			return getCollaboration_3086IncomingLinks(view);
-		case InterfaceEditPartCN.VISUAL_ID:
-			return getInterface_3087IncomingLinks(view);
-		case PrimitiveTypeEditPartCN.VISUAL_ID:
-			return getPrimitiveType_3078IncomingLinks(view);
-		case EnumerationEditPartCN.VISUAL_ID:
-			return getEnumeration_3079IncomingLinks(view);
-		case DataTypeEditPartCN.VISUAL_ID:
-			return getDataType_3080IncomingLinks(view);
-		case ActorEditPartCN.VISUAL_ID:
-			return getActor_3091IncomingLinks(view);
-		case DeploymentSpecificationEditPartCN.VISUAL_ID:
-			return getDeploymentSpecification_3092IncomingLinks(view);
-		case ArtifactEditPartCN.VISUAL_ID:
-			return getArtifact_3093IncomingLinks(view);
-		case InformationItemEditPartCN.VISUAL_ID:
-			return getInformationItem_3094IncomingLinks(view);
-		case SignalEditPartCN.VISUAL_ID:
-			return getSignal_3095IncomingLinks(view);
-		case UseCaseEditPartCN.VISUAL_ID:
-			return getUseCase_3096IncomingLinks(view);
-		case CommentEditPartCN.VISUAL_ID:
-			return getComment_3097IncomingLinks(view);
-		case DurationConstraintEditPartCN.VISUAL_ID:
-			return getDurationConstraint_3116IncomingLinks(view);
-		case TimeConstraintEditPartCN.VISUAL_ID:
-			return getTimeConstraint_3117IncomingLinks(view);
-		case IntervalConstraintEditPartCN.VISUAL_ID:
-			return getIntervalConstraint_3118IncomingLinks(view);
-		case InteractionConstraintEditPartCN.VISUAL_ID:
-			return getInteractionConstraint_3119IncomingLinks(view);
-		case ConstraintEditPartCN.VISUAL_ID:
-			return getConstraint_3120IncomingLinks(view);
-		case PropertyEditPartCLN.VISUAL_ID:
-			return getProperty_3101IncomingLinks(view);
-		case OperationEditPartCLN.VISUAL_ID:
-			return getOperation_3102IncomingLinks(view);
-		case EnumerationLiteralEditPartCLN.VISUAL_ID:
-			return getEnumerationLiteral_3066IncomingLinks(view);
-		case ComponentRealizationEditPart.VISUAL_ID:
-			return getComponentRealization_4004IncomingLinks(view);
-		case InterfaceRealizationEditPart.VISUAL_ID:
-			return getInterfaceRealization_4005IncomingLinks(view);
-		case SubstitutionEditPart.VISUAL_ID:
-			return getSubstitution_4011IncomingLinks(view);
-		case RealizationEditPart.VISUAL_ID:
-			return getRealization_4006IncomingLinks(view);
-		case ManifestationEditPart.VISUAL_ID:
-			return getManifestation_4012IncomingLinks(view);
-		case AbstractionEditPart.VISUAL_ID:
-			return getAbstraction_4007IncomingLinks(view);
-		case UsageEditPart.VISUAL_ID:
-			return getUsage_4008IncomingLinks(view);
-		case DeploymentEditPart.VISUAL_ID:
-			return getDeployment_4009IncomingLinks(view);
-		case RoleBindingEditPart.VISUAL_ID:
-			return getDependency_4017IncomingLinks(view);
-		case DependencyEditPart.VISUAL_ID:
-			return getDependency_4010IncomingLinks(view);
-		case ConnectorEditPart.VISUAL_ID:
-			return getConnector_4013IncomingLinks(view);
-		case GeneralizationEditPart.VISUAL_ID:
-			return getGeneralization_4015IncomingLinks(view);
-		case InformationFlowEditPart.VISUAL_ID:
-			return getInformationFlow_4021IncomingLinks(view);
-		}
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getOutgoingLinks(View view) {
-		switch (UMLVisualIDRegistry.getVisualID(view)) {
-		case ActivityCompositeEditPart.VISUAL_ID:
-			return getActivity_2060OutgoingLinks(view);
-		case InteractionCompositeEditPart.VISUAL_ID:
-			return getInteraction_2061OutgoingLinks(view);
-		case ProtocolStateMachineCompositeEditPart.VISUAL_ID:
-			return getProtocolStateMachine_2062OutgoingLinks(view);
-		case StateMachineCompositeEditPart.VISUAL_ID:
-			return getStateMachine_2063OutgoingLinks(view);
-		case FunctionBehaviorCompositeEditPart.VISUAL_ID:
-			return getFunctionBehavior_2064OutgoingLinks(view);
-		case OpaqueBehaviorCompositeEditPart.VISUAL_ID:
-			return getOpaqueBehavior_2065OutgoingLinks(view);
-		case ComponentCompositeEditPart.VISUAL_ID:
-			return getComponent_2069OutgoingLinks(view);
-		case DeviceCompositeEditPart.VISUAL_ID:
-			return getDevice_2070OutgoingLinks(view);
-		case ExecutionEnvironmentCompositeEditPart.VISUAL_ID:
-			return getExecutionEnvironment_2071OutgoingLinks(view);
-		case NodeCompositeEditPart.VISUAL_ID:
-			return getNode_2072OutgoingLinks(view);
-		case ClassCompositeEditPart.VISUAL_ID:
-			return getClass_2073OutgoingLinks(view);
-		case CollaborationCompositeEditPart.VISUAL_ID:
-			return getCollaboration_2075OutgoingLinks(view);
-		case InterfaceEditPart.VISUAL_ID:
-			return getInterface_2076OutgoingLinks(view);
-		case PrimitiveTypeEditPart.VISUAL_ID:
-			return getPrimitiveType_2066OutgoingLinks(view);
-		case EnumerationEditPart.VISUAL_ID:
-			return getEnumeration_2067OutgoingLinks(view);
-		case DataTypeEditPart.VISUAL_ID:
-			return getDataType_2068OutgoingLinks(view);
-		case ActorEditPart.VISUAL_ID:
-			return getActor_2077OutgoingLinks(view);
-		case DeploymentSpecificationEditPart.VISUAL_ID:
-			return getDeploymentSpecification_2078OutgoingLinks(view);
-		case ArtifactEditPart.VISUAL_ID:
-			return getArtifact_2079OutgoingLinks(view);
-		case InformationItemEditPart.VISUAL_ID:
-			return getInformationItem_2080OutgoingLinks(view);
-		case SignalEditPart.VISUAL_ID:
-			return getSignal_2081OutgoingLinks(view);
-		case UseCaseEditPart.VISUAL_ID:
-			return getUseCase_2082OutgoingLinks(view);
-		case SignalEventEditPart.VISUAL_ID:
-			return getSignalEvent_2083OutgoingLinks(view);
-		case CallEventEditPart.VISUAL_ID:
-			return getCallEvent_2084OutgoingLinks(view);
-		case AnyReceiveEventEditPart.VISUAL_ID:
-			return getAnyReceiveEvent_2085OutgoingLinks(view);
-		case ChangeEventEditPart.VISUAL_ID:
-			return getChangeEvent_2088OutgoingLinks(view);
-		case TimeEventEditPart.VISUAL_ID:
-			return getTimeEvent_2089OutgoingLinks(view);
-		case DurationObservationEditPart.VISUAL_ID:
-			return getDurationObservation_2093OutgoingLinks(view);
-		case TimeObservationEditPart.VISUAL_ID:
-			return getTimeObservation_2094OutgoingLinks(view);
-		case LiteralBooleanEditPart.VISUAL_ID:
-			return getLiteralBoolean_2095OutgoingLinks(view);
-		case LiteralIntegerEditPart.VISUAL_ID:
-			return getLiteralInteger_2096OutgoingLinks(view);
-		case LiteralNullEditPart.VISUAL_ID:
-			return getLiteralNull_2097OutgoingLinks(view);
-		case LiteralStringEditPart.VISUAL_ID:
-			return getLiteralString_2098OutgoingLinks(view);
-		case LiteralUnlimitedNaturalEditPart.VISUAL_ID:
-			return getLiteralUnlimitedNatural_2099OutgoingLinks(view);
-		case StringExpressionEditPart.VISUAL_ID:
-			return getStringExpression_2100OutgoingLinks(view);
-		case OpaqueExpressionEditPart.VISUAL_ID:
-			return getOpaqueExpression_2101OutgoingLinks(view);
-		case TimeExpressionEditPart.VISUAL_ID:
-			return getTimeExpression_2102OutgoingLinks(view);
-		case ExpressionEditPart.VISUAL_ID:
-			return getExpression_2103OutgoingLinks(view);
-		case DurationEditPart.VISUAL_ID:
-			return getDuration_2104OutgoingLinks(view);
-		case TimeIntervalEditPart.VISUAL_ID:
-			return getTimeInterval_2105OutgoingLinks(view);
-		case DurationIntervalEditPart.VISUAL_ID:
-			return getDurationInterval_2106OutgoingLinks(view);
-		case IntervalEditPart.VISUAL_ID:
-			return getInterval_2107OutgoingLinks(view);
-		case InstanceValueEditPart.VISUAL_ID:
-			return getInstanceValue_2108OutgoingLinks(view);
-		case CommentEditPart.VISUAL_ID:
-			return getComment_2109OutgoingLinks(view);
-		case DurationConstraintEditPart.VISUAL_ID:
-			return getDurationConstraint_2110OutgoingLinks(view);
-		case TimeConstraintEditPart.VISUAL_ID:
-			return getTimeConstraint_2111OutgoingLinks(view);
-		case IntervalConstraintEditPart.VISUAL_ID:
-			return getIntervalConstraint_2112OutgoingLinks(view);
-		case InteractionConstraintEditPart.VISUAL_ID:
-			return getInteractionConstraint_2113OutgoingLinks(view);
-		case ConstraintEditPart.VISUAL_ID:
-			return getConstraint_2114OutgoingLinks(view);
-		case PortEditPart.VISUAL_ID:
-			return getPort_3069OutgoingLinks(view);
-		case ParameterEditPart.VISUAL_ID:
-			return getParameter_3088OutgoingLinks(view);
-		case PropertyPartEditPartCN.VISUAL_ID:
-			return getProperty_3070OutgoingLinks(view);
-		case CollaborationRoleEditPartCN.VISUAL_ID:
-			return getConnectableElement_3115OutgoingLinks(view);
-		case CollaborationUseEditPartCN.VISUAL_ID:
-			return getCollaborationUse_3071OutgoingLinks(view);
-		case ActivityCompositeEditPartCN.VISUAL_ID:
-			return getActivity_3072OutgoingLinks(view);
-		case InteractionCompositeEditPartCN.VISUAL_ID:
-			return getInteraction_3073OutgoingLinks(view);
-		case ProtocolStateMachineCompositeEditPartCN.VISUAL_ID:
-			return getProtocolStateMachine_3074OutgoingLinks(view);
-		case StateMachineCompositeEditPartCN.VISUAL_ID:
-			return getStateMachine_3075OutgoingLinks(view);
-		case FunctionBehaviorCompositeEditPartCN.VISUAL_ID:
-			return getFunctionBehavior_3076OutgoingLinks(view);
-		case OpaqueBehaviorCompositeEditPartCN.VISUAL_ID:
-			return getOpaqueBehavior_3077OutgoingLinks(view);
-		case ComponentCompositeEditPartCN.VISUAL_ID:
-			return getComponent_3081OutgoingLinks(view);
-		case DeviceCompositeEditPartCN.VISUAL_ID:
-			return getDevice_3082OutgoingLinks(view);
-		case ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID:
-			return getExecutionEnvironment_3083OutgoingLinks(view);
-		case NodeCompositeEditPartCN.VISUAL_ID:
-			return getNode_3084OutgoingLinks(view);
-		case ClassCompositeEditPartCN.VISUAL_ID:
-			return getClass_3085OutgoingLinks(view);
-		case CollaborationCompositeEditPartCN.VISUAL_ID:
-			return getCollaboration_3086OutgoingLinks(view);
-		case InterfaceEditPartCN.VISUAL_ID:
-			return getInterface_3087OutgoingLinks(view);
-		case PrimitiveTypeEditPartCN.VISUAL_ID:
-			return getPrimitiveType_3078OutgoingLinks(view);
-		case EnumerationEditPartCN.VISUAL_ID:
-			return getEnumeration_3079OutgoingLinks(view);
-		case DataTypeEditPartCN.VISUAL_ID:
-			return getDataType_3080OutgoingLinks(view);
-		case ActorEditPartCN.VISUAL_ID:
-			return getActor_3091OutgoingLinks(view);
-		case DeploymentSpecificationEditPartCN.VISUAL_ID:
-			return getDeploymentSpecification_3092OutgoingLinks(view);
-		case ArtifactEditPartCN.VISUAL_ID:
-			return getArtifact_3093OutgoingLinks(view);
-		case InformationItemEditPartCN.VISUAL_ID:
-			return getInformationItem_3094OutgoingLinks(view);
-		case SignalEditPartCN.VISUAL_ID:
-			return getSignal_3095OutgoingLinks(view);
-		case UseCaseEditPartCN.VISUAL_ID:
-			return getUseCase_3096OutgoingLinks(view);
-		case CommentEditPartCN.VISUAL_ID:
-			return getComment_3097OutgoingLinks(view);
-		case DurationConstraintEditPartCN.VISUAL_ID:
-			return getDurationConstraint_3116OutgoingLinks(view);
-		case TimeConstraintEditPartCN.VISUAL_ID:
-			return getTimeConstraint_3117OutgoingLinks(view);
-		case IntervalConstraintEditPartCN.VISUAL_ID:
-			return getIntervalConstraint_3118OutgoingLinks(view);
-		case InteractionConstraintEditPartCN.VISUAL_ID:
-			return getInteractionConstraint_3119OutgoingLinks(view);
-		case ConstraintEditPartCN.VISUAL_ID:
-			return getConstraint_3120OutgoingLinks(view);
-		case PropertyEditPartCLN.VISUAL_ID:
-			return getProperty_3101OutgoingLinks(view);
-		case OperationEditPartCLN.VISUAL_ID:
-			return getOperation_3102OutgoingLinks(view);
-		case EnumerationLiteralEditPartCLN.VISUAL_ID:
-			return getEnumerationLiteral_3066OutgoingLinks(view);
-		case ComponentRealizationEditPart.VISUAL_ID:
-			return getComponentRealization_4004OutgoingLinks(view);
-		case InterfaceRealizationEditPart.VISUAL_ID:
-			return getInterfaceRealization_4005OutgoingLinks(view);
-		case SubstitutionEditPart.VISUAL_ID:
-			return getSubstitution_4011OutgoingLinks(view);
-		case RealizationEditPart.VISUAL_ID:
-			return getRealization_4006OutgoingLinks(view);
-		case ManifestationEditPart.VISUAL_ID:
-			return getManifestation_4012OutgoingLinks(view);
-		case AbstractionEditPart.VISUAL_ID:
-			return getAbstraction_4007OutgoingLinks(view);
-		case UsageEditPart.VISUAL_ID:
-			return getUsage_4008OutgoingLinks(view);
-		case DeploymentEditPart.VISUAL_ID:
-			return getDeployment_4009OutgoingLinks(view);
-		case RoleBindingEditPart.VISUAL_ID:
-			return getDependency_4017OutgoingLinks(view);
-		case DependencyEditPart.VISUAL_ID:
-			return getDependency_4010OutgoingLinks(view);
-		case ConnectorEditPart.VISUAL_ID:
-			return getConnector_4013OutgoingLinks(view);
-		case GeneralizationEditPart.VISUAL_ID:
-			return getGeneralization_4015OutgoingLinks(view);
-		case InformationFlowEditPart.VISUAL_ID:
-			return getInformationFlow_4021OutgoingLinks(view);
-		}
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getPackage_1000ContainedLinks(View view) {
-		Package modelElement = (Package) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getActivity_2060ContainedLinks(View view) {
-		Activity modelElement = (Activity) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInteraction_2061ContainedLinks(View view) {
-		Interaction modelElement = (Interaction) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getProtocolStateMachine_2062ContainedLinks(View view) {
-		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getStateMachine_2063ContainedLinks(View view) {
-		StateMachine modelElement = (StateMachine) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getFunctionBehavior_2064ContainedLinks(View view) {
-		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getOpaqueBehavior_2065ContainedLinks(View view) {
-		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getComponent_2069ContainedLinks(View view) {
-		Component modelElement = (Component) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDevice_2070ContainedLinks(View view) {
-		Device modelElement = (Device) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getExecutionEnvironment_2071ContainedLinks(View view) {
-		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getNode_2072ContainedLinks(View view) {
-		Node modelElement = (Node) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getClass_2073ContainedLinks(View view) {
-		Class modelElement = (Class) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getCollaboration_2075ContainedLinks(View view) {
-		Collaboration modelElement = (Collaboration) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInterface_2076ContainedLinks(View view) {
-		Interface modelElement = (Interface) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getPrimitiveType_2066ContainedLinks(View view) {
-		PrimitiveType modelElement = (PrimitiveType) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getEnumeration_2067ContainedLinks(View view) {
-		Enumeration modelElement = (Enumeration) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDataType_2068ContainedLinks(View view) {
-		DataType modelElement = (DataType) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getActor_2077ContainedLinks(View view) {
-		Actor modelElement = (Actor) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDeploymentSpecification_2078ContainedLinks(View view) {
-		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getArtifact_2079ContainedLinks(View view) {
-		Artifact modelElement = (Artifact) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInformationItem_2080ContainedLinks(View view) {
-		InformationItem modelElement = (InformationItem) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getSignal_2081ContainedLinks(View view) {
-		Signal modelElement = (Signal) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getUseCase_2082ContainedLinks(View view) {
-		UseCase modelElement = (UseCase) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getSignalEvent_2083ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getCallEvent_2084ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getAnyReceiveEvent_2085ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getChangeEvent_2088ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getTimeEvent_2089ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDurationObservation_2093ContainedLinks(View view) {
-		DurationObservation modelElement = (DurationObservation) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getTimeObservation_2094ContainedLinks(View view) {
-		TimeObservation modelElement = (TimeObservation) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getLiteralBoolean_2095ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getLiteralInteger_2096ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getLiteralNull_2097ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getLiteralString_2098ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getLiteralUnlimitedNatural_2099ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getStringExpression_2100ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getOpaqueExpression_2101ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getTimeExpression_2102ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getExpression_2103ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDuration_2104ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getTimeInterval_2105ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDurationInterval_2106ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInterval_2107ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInstanceValue_2108ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getComment_2109ContainedLinks(View view) {
-		Comment modelElement = (Comment) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDurationConstraint_2110ContainedLinks(View view) {
-		DurationConstraint modelElement = (DurationConstraint) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getTimeConstraint_2111ContainedLinks(View view) {
-		TimeConstraint modelElement = (TimeConstraint) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getIntervalConstraint_2112ContainedLinks(View view) {
-		IntervalConstraint modelElement = (IntervalConstraint) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInteractionConstraint_2113ContainedLinks(View view) {
-		InteractionConstraint modelElement = (InteractionConstraint) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getConstraint_2114ContainedLinks(View view) {
-		Constraint modelElement = (Constraint) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getPort_3069ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getParameter_3088ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getProperty_3070ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getConnectableElement_3115ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getCollaborationUse_3071ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getActivity_3072ContainedLinks(View view) {
-		Activity modelElement = (Activity) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInteraction_3073ContainedLinks(View view) {
-		Interaction modelElement = (Interaction) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getProtocolStateMachine_3074ContainedLinks(View view) {
-		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getStateMachine_3075ContainedLinks(View view) {
-		StateMachine modelElement = (StateMachine) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getFunctionBehavior_3076ContainedLinks(View view) {
-		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getOpaqueBehavior_3077ContainedLinks(View view) {
-		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getComponent_3081ContainedLinks(View view) {
-		Component modelElement = (Component) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDevice_3082ContainedLinks(View view) {
-		Device modelElement = (Device) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getExecutionEnvironment_3083ContainedLinks(View view) {
-		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getNode_3084ContainedLinks(View view) {
-		Node modelElement = (Node) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getClass_3085ContainedLinks(View view) {
-		Class modelElement = (Class) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getCollaboration_3086ContainedLinks(View view) {
-		Collaboration modelElement = (Collaboration) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Connector_4013
-				(modelElement));
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInterface_3087ContainedLinks(View view) {
-		Interface modelElement = (Interface) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getPrimitiveType_3078ContainedLinks(View view) {
-		PrimitiveType modelElement = (PrimitiveType) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getEnumeration_3079ContainedLinks(View view) {
-		Enumeration modelElement = (Enumeration) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDataType_3080ContainedLinks(View view) {
-		DataType modelElement = (DataType) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getActor_3091ContainedLinks(View view) {
-		Actor modelElement = (Actor) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDeploymentSpecification_3092ContainedLinks(View view) {
-		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getArtifact_3093ContainedLinks(View view) {
-		Artifact modelElement = (Artifact) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInformationItem_3094ContainedLinks(View view) {
-		InformationItem modelElement = (InformationItem) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getSignal_3095ContainedLinks(View view) {
-		Signal modelElement = (Signal) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getUseCase_3096ContainedLinks(View view) {
-		UseCase modelElement = (UseCase) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getComment_3097ContainedLinks(View view) {
-		Comment modelElement = (Comment) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDurationConstraint_3116ContainedLinks(View view) {
-		DurationConstraint modelElement = (DurationConstraint) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getTimeConstraint_3117ContainedLinks(View view) {
-		TimeConstraint modelElement = (TimeConstraint) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getIntervalConstraint_3118ContainedLinks(View view) {
-		IntervalConstraint modelElement = (IntervalConstraint) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInteractionConstraint_3119ContainedLinks(View view) {
-		InteractionConstraint modelElement = (InteractionConstraint) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getConstraint_3120ContainedLinks(View view) {
-		Constraint modelElement = (Constraint) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getProperty_3101ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getOperation_3102ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getEnumerationLiteral_3066ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getComponentRealization_4004ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInterfaceRealization_4005ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getSubstitution_4011ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getRealization_4006ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getManifestation_4012ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getAbstraction_4007ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getUsage_4008ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDeployment_4009ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDependency_4017ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDependency_4010ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getConnector_4013ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getGeneralization_4015ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInformationFlow_4021ContainedLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getActivity_2060IncomingLinks(View view) {
-		Activity modelElement = (Activity) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInteraction_2061IncomingLinks(View view) {
-		Interaction modelElement = (Interaction) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getProtocolStateMachine_2062IncomingLinks(View view) {
-		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getStateMachine_2063IncomingLinks(View view) {
-		StateMachine modelElement = (StateMachine) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getFunctionBehavior_2064IncomingLinks(View view) {
-		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getOpaqueBehavior_2065IncomingLinks(View view) {
-		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getComponent_2069IncomingLinks(View view) {
-		Component modelElement = (Component) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDevice_2070IncomingLinks(View view) {
-		Device modelElement = (Device) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getExecutionEnvironment_2071IncomingLinks(View view) {
-		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getNode_2072IncomingLinks(View view) {
-		Node modelElement = (Node) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getClass_2073IncomingLinks(View view) {
-		Class modelElement = (Class) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getCollaboration_2075IncomingLinks(View view) {
-		Collaboration modelElement = (Collaboration) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInterface_2076IncomingLinks(View view) {
-		Interface modelElement = (Interface) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getPrimitiveType_2066IncomingLinks(View view) {
-		PrimitiveType modelElement = (PrimitiveType) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getEnumeration_2067IncomingLinks(View view) {
-		Enumeration modelElement = (Enumeration) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDataType_2068IncomingLinks(View view) {
-		DataType modelElement = (DataType) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getActor_2077IncomingLinks(View view) {
-		Actor modelElement = (Actor) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDeploymentSpecification_2078IncomingLinks(View view) {
-		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getArtifact_2079IncomingLinks(View view) {
-		Artifact modelElement = (Artifact) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInformationItem_2080IncomingLinks(View view) {
-		InformationItem modelElement = (InformationItem) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getSignal_2081IncomingLinks(View view) {
-		Signal modelElement = (Signal) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getUseCase_2082IncomingLinks(View view) {
-		UseCase modelElement = (UseCase) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getSignalEvent_2083IncomingLinks(View view) {
-		SignalEvent modelElement = (SignalEvent) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getCallEvent_2084IncomingLinks(View view) {
-		CallEvent modelElement = (CallEvent) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getAnyReceiveEvent_2085IncomingLinks(View view) {
-		AnyReceiveEvent modelElement = (AnyReceiveEvent) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getChangeEvent_2088IncomingLinks(View view) {
-		ChangeEvent modelElement = (ChangeEvent) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getTimeEvent_2089IncomingLinks(View view) {
-		TimeEvent modelElement = (TimeEvent) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDurationObservation_2093IncomingLinks(View view) {
-		DurationObservation modelElement = (DurationObservation) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getTimeObservation_2094IncomingLinks(View view) {
-		TimeObservation modelElement = (TimeObservation) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getLiteralBoolean_2095IncomingLinks(View view) {
-		LiteralBoolean modelElement = (LiteralBoolean) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getLiteralInteger_2096IncomingLinks(View view) {
-		LiteralInteger modelElement = (LiteralInteger) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getLiteralNull_2097IncomingLinks(View view) {
-		LiteralNull modelElement = (LiteralNull) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getLiteralString_2098IncomingLinks(View view) {
-		LiteralString modelElement = (LiteralString) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getLiteralUnlimitedNatural_2099IncomingLinks(View view) {
-		LiteralUnlimitedNatural modelElement = (LiteralUnlimitedNatural) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getStringExpression_2100IncomingLinks(View view) {
-		StringExpression modelElement = (StringExpression) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getOpaqueExpression_2101IncomingLinks(View view) {
-		OpaqueExpression modelElement = (OpaqueExpression) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getTimeExpression_2102IncomingLinks(View view) {
-		TimeExpression modelElement = (TimeExpression) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getExpression_2103IncomingLinks(View view) {
-		Expression modelElement = (Expression) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDuration_2104IncomingLinks(View view) {
-		Duration modelElement = (Duration) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getTimeInterval_2105IncomingLinks(View view) {
-		TimeInterval modelElement = (TimeInterval) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDurationInterval_2106IncomingLinks(View view) {
-		DurationInterval modelElement = (DurationInterval) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInterval_2107IncomingLinks(View view) {
-		Interval modelElement = (Interval) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInstanceValue_2108IncomingLinks(View view) {
-		InstanceValue modelElement = (InstanceValue) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getComment_2109IncomingLinks(View view) {
-		Comment modelElement = (Comment) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDurationConstraint_2110IncomingLinks(View view) {
-		DurationConstraint modelElement = (DurationConstraint) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getTimeConstraint_2111IncomingLinks(View view) {
-		TimeConstraint modelElement = (TimeConstraint) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getIntervalConstraint_2112IncomingLinks(View view) {
-		IntervalConstraint modelElement = (IntervalConstraint) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInteractionConstraint_2113IncomingLinks(View view) {
-		InteractionConstraint modelElement = (InteractionConstraint) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getConstraint_2114IncomingLinks(View view) {
-		Constraint modelElement = (Constraint) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getPort_3069IncomingLinks(View view) {
-		Port modelElement = (Port) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getParameter_3088IncomingLinks(View view) {
-		Parameter modelElement = (Parameter) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getProperty_3070IncomingLinks(View view) {
-		Property modelElement = (Property) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getConnectableElement_3115IncomingLinks(View view) {
-		ConnectableElement modelElement = (ConnectableElement) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getCollaborationUse_3071IncomingLinks(View view) {
-		CollaborationUse modelElement = (CollaborationUse) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getActivity_3072IncomingLinks(View view) {
-		Activity modelElement = (Activity) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInteraction_3073IncomingLinks(View view) {
-		Interaction modelElement = (Interaction) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getProtocolStateMachine_3074IncomingLinks(View view) {
-		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getStateMachine_3075IncomingLinks(View view) {
-		StateMachine modelElement = (StateMachine) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getFunctionBehavior_3076IncomingLinks(View view) {
-		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getOpaqueBehavior_3077IncomingLinks(View view) {
-		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getComponent_3081IncomingLinks(View view) {
-		Component modelElement = (Component) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDevice_3082IncomingLinks(View view) {
-		Device modelElement = (Device) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getExecutionEnvironment_3083IncomingLinks(View view) {
-		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getNode_3084IncomingLinks(View view) {
-		Node modelElement = (Node) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getClass_3085IncomingLinks(View view) {
-		Class modelElement = (Class) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getCollaboration_3086IncomingLinks(View view) {
-		Collaboration modelElement = (Collaboration) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInterface_3087IncomingLinks(View view) {
-		Interface modelElement = (Interface) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getPrimitiveType_3078IncomingLinks(View view) {
-		PrimitiveType modelElement = (PrimitiveType) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getEnumeration_3079IncomingLinks(View view) {
-		Enumeration modelElement = (Enumeration) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDataType_3080IncomingLinks(View view) {
-		DataType modelElement = (DataType) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getActor_3091IncomingLinks(View view) {
-		Actor modelElement = (Actor) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDeploymentSpecification_3092IncomingLinks(View view) {
-		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getArtifact_3093IncomingLinks(View view) {
-		Artifact modelElement = (Artifact) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInformationItem_3094IncomingLinks(View view) {
-		InformationItem modelElement = (InformationItem) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getSignal_3095IncomingLinks(View view) {
-		Signal modelElement = (Signal) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getUseCase_3096IncomingLinks(View view) {
-		UseCase modelElement = (UseCase) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getComment_3097IncomingLinks(View view) {
-		Comment modelElement = (Comment) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDurationConstraint_3116IncomingLinks(View view) {
-		DurationConstraint modelElement = (DurationConstraint) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getTimeConstraint_3117IncomingLinks(View view) {
-		TimeConstraint modelElement = (TimeConstraint) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getIntervalConstraint_3118IncomingLinks(View view) {
-		IntervalConstraint modelElement = (IntervalConstraint) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInteractionConstraint_3119IncomingLinks(View view) {
-		InteractionConstraint modelElement = (InteractionConstraint) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getConstraint_3120IncomingLinks(View view) {
-		Constraint modelElement = (Constraint) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getProperty_3101IncomingLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getOperation_3102IncomingLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getEnumerationLiteral_3066IncomingLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getComponentRealization_4004IncomingLinks(View view) {
-		ComponentRealization modelElement = (ComponentRealization) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInterfaceRealization_4005IncomingLinks(View view) {
-		InterfaceRealization modelElement = (InterfaceRealization) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getSubstitution_4011IncomingLinks(View view) {
-		Substitution modelElement = (Substitution) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getRealization_4006IncomingLinks(View view) {
-		Realization modelElement = (Realization) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getManifestation_4012IncomingLinks(View view) {
-		Manifestation modelElement = (Manifestation) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getAbstraction_4007IncomingLinks(View view) {
-		Abstraction modelElement = (Abstraction) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getUsage_4008IncomingLinks(View view) {
-		Usage modelElement = (Usage) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDeployment_4009IncomingLinks(View view) {
-		Deployment modelElement = (Deployment) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDependency_4017IncomingLinks(View view) {
-		Dependency modelElement = (Dependency) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDependency_4010IncomingLinks(View view) {
-		Dependency modelElement = (Dependency) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getConnector_4013IncomingLinks(View view) {
-		Connector modelElement = (Connector) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getGeneralization_4015IncomingLinks(View view) {
-		Generalization modelElement = (Generalization) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInformationFlow_4021IncomingLinks(View view) {
-		InformationFlow modelElement = (InformationFlow) view.getElement();
-		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement, crossReferencer));
-		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement, crossReferencer));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getActivity_2060OutgoingLinks(View view) {
-		Activity modelElement = (Activity) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInteraction_2061OutgoingLinks(View view) {
-		Interaction modelElement = (Interaction) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getProtocolStateMachine_2062OutgoingLinks(View view) {
-		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getStateMachine_2063OutgoingLinks(View view) {
-		StateMachine modelElement = (StateMachine) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getFunctionBehavior_2064OutgoingLinks(View view) {
-		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getOpaqueBehavior_2065OutgoingLinks(View view) {
-		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getComponent_2069OutgoingLinks(View view) {
-		Component modelElement = (Component) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDevice_2070OutgoingLinks(View view) {
-		Device modelElement = (Device) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getExecutionEnvironment_2071OutgoingLinks(View view) {
-		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getNode_2072OutgoingLinks(View view) {
-		Node modelElement = (Node) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getClass_2073OutgoingLinks(View view) {
-		Class modelElement = (Class) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getCollaboration_2075OutgoingLinks(View view) {
-		Collaboration modelElement = (Collaboration) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInterface_2076OutgoingLinks(View view) {
-		Interface modelElement = (Interface) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getPrimitiveType_2066OutgoingLinks(View view) {
-		PrimitiveType modelElement = (PrimitiveType) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getEnumeration_2067OutgoingLinks(View view) {
-		Enumeration modelElement = (Enumeration) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDataType_2068OutgoingLinks(View view) {
-		DataType modelElement = (DataType) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getActor_2077OutgoingLinks(View view) {
-		Actor modelElement = (Actor) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDeploymentSpecification_2078OutgoingLinks(View view) {
-		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getArtifact_2079OutgoingLinks(View view) {
-		Artifact modelElement = (Artifact) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInformationItem_2080OutgoingLinks(View view) {
-		InformationItem modelElement = (InformationItem) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getSignal_2081OutgoingLinks(View view) {
-		Signal modelElement = (Signal) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getUseCase_2082OutgoingLinks(View view) {
-		UseCase modelElement = (UseCase) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getSignalEvent_2083OutgoingLinks(View view) {
-		SignalEvent modelElement = (SignalEvent) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getCallEvent_2084OutgoingLinks(View view) {
-		CallEvent modelElement = (CallEvent) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getAnyReceiveEvent_2085OutgoingLinks(View view) {
-		AnyReceiveEvent modelElement = (AnyReceiveEvent) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getChangeEvent_2088OutgoingLinks(View view) {
-		ChangeEvent modelElement = (ChangeEvent) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getTimeEvent_2089OutgoingLinks(View view) {
-		TimeEvent modelElement = (TimeEvent) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDurationObservation_2093OutgoingLinks(View view) {
-		DurationObservation modelElement = (DurationObservation) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingFeatureModelFacetLinks_DurationObservation_Event_4019
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getTimeObservation_2094OutgoingLinks(View view) {
-		TimeObservation modelElement = (TimeObservation) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingFeatureModelFacetLinks_TimeObservation_Event_4018
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getLiteralBoolean_2095OutgoingLinks(View view) {
-		LiteralBoolean modelElement = (LiteralBoolean) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getLiteralInteger_2096OutgoingLinks(View view) {
-		LiteralInteger modelElement = (LiteralInteger) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getLiteralNull_2097OutgoingLinks(View view) {
-		LiteralNull modelElement = (LiteralNull) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getLiteralString_2098OutgoingLinks(View view) {
-		LiteralString modelElement = (LiteralString) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getLiteralUnlimitedNatural_2099OutgoingLinks(View view) {
-		LiteralUnlimitedNatural modelElement = (LiteralUnlimitedNatural) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getStringExpression_2100OutgoingLinks(View view) {
-		StringExpression modelElement = (StringExpression) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getOpaqueExpression_2101OutgoingLinks(View view) {
-		OpaqueExpression modelElement = (OpaqueExpression) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getTimeExpression_2102OutgoingLinks(View view) {
-		TimeExpression modelElement = (TimeExpression) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getExpression_2103OutgoingLinks(View view) {
-		Expression modelElement = (Expression) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDuration_2104OutgoingLinks(View view) {
-		Duration modelElement = (Duration) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getTimeInterval_2105OutgoingLinks(View view) {
-		TimeInterval modelElement = (TimeInterval) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDurationInterval_2106OutgoingLinks(View view) {
-		DurationInterval modelElement = (DurationInterval) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInterval_2107OutgoingLinks(View view) {
-		Interval modelElement = (Interval) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInstanceValue_2108OutgoingLinks(View view) {
-		InstanceValue modelElement = (InstanceValue) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getComment_2109OutgoingLinks(View view) {
-		Comment modelElement = (Comment) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDurationConstraint_2110OutgoingLinks(View view) {
-		DurationConstraint modelElement = (DurationConstraint) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getTimeConstraint_2111OutgoingLinks(View view) {
-		TimeConstraint modelElement = (TimeConstraint) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getIntervalConstraint_2112OutgoingLinks(View view) {
-		IntervalConstraint modelElement = (IntervalConstraint) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInteractionConstraint_2113OutgoingLinks(View view) {
-		InteractionConstraint modelElement = (InteractionConstraint) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getConstraint_2114OutgoingLinks(View view) {
-		Constraint modelElement = (Constraint) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getPort_3069OutgoingLinks(View view) {
-		Port modelElement = (Port) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getParameter_3088OutgoingLinks(View view) {
-		Parameter modelElement = (Parameter) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getProperty_3070OutgoingLinks(View view) {
-		Property modelElement = (Property) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getConnectableElement_3115OutgoingLinks(View view) {
-		ConnectableElement modelElement = (ConnectableElement) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getCollaborationUse_3071OutgoingLinks(View view) {
-		CollaborationUse modelElement = (CollaborationUse) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getActivity_3072OutgoingLinks(View view) {
-		Activity modelElement = (Activity) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInteraction_3073OutgoingLinks(View view) {
-		Interaction modelElement = (Interaction) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getProtocolStateMachine_3074OutgoingLinks(View view) {
-		ProtocolStateMachine modelElement = (ProtocolStateMachine) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getStateMachine_3075OutgoingLinks(View view) {
-		StateMachine modelElement = (StateMachine) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getFunctionBehavior_3076OutgoingLinks(View view) {
-		FunctionBehavior modelElement = (FunctionBehavior) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getOpaqueBehavior_3077OutgoingLinks(View view) {
-		OpaqueBehavior modelElement = (OpaqueBehavior) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getComponent_3081OutgoingLinks(View view) {
-		Component modelElement = (Component) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDevice_3082OutgoingLinks(View view) {
-		Device modelElement = (Device) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getExecutionEnvironment_3083OutgoingLinks(View view) {
-		ExecutionEnvironment modelElement = (ExecutionEnvironment) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getNode_3084OutgoingLinks(View view) {
-		Node modelElement = (Node) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getClass_3085OutgoingLinks(View view) {
-		Class modelElement = (Class) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getCollaboration_3086OutgoingLinks(View view) {
-		Collaboration modelElement = (Collaboration) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInterface_3087OutgoingLinks(View view) {
-		Interface modelElement = (Interface) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getPrimitiveType_3078OutgoingLinks(View view) {
-		PrimitiveType modelElement = (PrimitiveType) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getEnumeration_3079OutgoingLinks(View view) {
-		Enumeration modelElement = (Enumeration) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDataType_3080OutgoingLinks(View view) {
-		DataType modelElement = (DataType) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getActor_3091OutgoingLinks(View view) {
-		Actor modelElement = (Actor) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDeploymentSpecification_3092OutgoingLinks(View view) {
-		DeploymentSpecification modelElement = (DeploymentSpecification) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getArtifact_3093OutgoingLinks(View view) {
-		Artifact modelElement = (Artifact) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInformationItem_3094OutgoingLinks(View view) {
-		InformationItem modelElement = (InformationItem) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getSignal_3095OutgoingLinks(View view) {
-		Signal modelElement = (Signal) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getUseCase_3096OutgoingLinks(View view) {
-		UseCase modelElement = (UseCase) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getComment_3097OutgoingLinks(View view) {
-		Comment modelElement = (Comment) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDurationConstraint_3116OutgoingLinks(View view) {
-		DurationConstraint modelElement = (DurationConstraint) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getTimeConstraint_3117OutgoingLinks(View view) {
-		TimeConstraint modelElement = (TimeConstraint) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getIntervalConstraint_3118OutgoingLinks(View view) {
-		IntervalConstraint modelElement = (IntervalConstraint) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInteractionConstraint_3119OutgoingLinks(View view) {
-		InteractionConstraint modelElement = (InteractionConstraint) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getConstraint_3120OutgoingLinks(View view) {
-		Constraint modelElement = (Constraint) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getProperty_3101OutgoingLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getOperation_3102OutgoingLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getEnumerationLiteral_3066OutgoingLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getComponentRealization_4004OutgoingLinks(View view) {
-		ComponentRealization modelElement = (ComponentRealization) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInterfaceRealization_4005OutgoingLinks(View view) {
-		InterfaceRealization modelElement = (InterfaceRealization) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getSubstitution_4011OutgoingLinks(View view) {
-		Substitution modelElement = (Substitution) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getRealization_4006OutgoingLinks(View view) {
-		Realization modelElement = (Realization) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getManifestation_4012OutgoingLinks(View view) {
-		Manifestation modelElement = (Manifestation) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getAbstraction_4007OutgoingLinks(View view) {
-		Abstraction modelElement = (Abstraction) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getUsage_4008OutgoingLinks(View view) {
-		Usage modelElement = (Usage) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDeployment_4009OutgoingLinks(View view) {
-		Deployment modelElement = (Deployment) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDependency_4017OutgoingLinks(View view) {
-		Dependency modelElement = (Dependency) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getDependency_4010OutgoingLinks(View view) {
-		Dependency modelElement = (Dependency) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getConnector_4013OutgoingLinks(View view) {
-		Connector modelElement = (Connector) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getGeneralization_4015OutgoingLinks(View view) {
-		return Collections.emptyList();
-	}
-
-	/**
-	 * @generated
-	 */
-	public static List<UMLLinkDescriptor> getInformationFlow_4021OutgoingLinks(View view) {
-		InformationFlow modelElement = (InformationFlow) view.getElement();
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010
-				(modelElement));
-		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021
-				(modelElement));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_ComponentRealization_4004(Package container) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements()
-				.iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof ComponentRealization) {
-				continue;
-			}
-			ComponentRealization link = (ComponentRealization) linkObject;
-			if (ComponentRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.ComponentRealization_4004, ComponentRealizationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_InterfaceRealization_4005(Package container) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements()
-				.iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof InterfaceRealization) {
-				continue;
-			}
-			InterfaceRealization link = (InterfaceRealization) linkObject;
-			if (InterfaceRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InterfaceRealization_4005, InterfaceRealizationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Substitution_4011(Package container) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements()
-				.iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Substitution) {
-				continue;
-			}
-			Substitution link = (Substitution) linkObject;
-			if (SubstitutionEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Substitution_4011, SubstitutionEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Realization_4006(Package container) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements()
-				.iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Realization) {
-				continue;
-			}
-			Realization link = (Realization) linkObject;
-			if (RealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Realization_4006, RealizationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Manifestation_4012(Package container) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements()
-				.iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Manifestation) {
-				continue;
-			}
-			Manifestation link = (Manifestation) linkObject;
-			if (ManifestationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Manifestation_4012, ManifestationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Abstraction_4007(Package container) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements()
-				.iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Abstraction) {
-				continue;
-			}
-			Abstraction link = (Abstraction) linkObject;
-			if (AbstractionEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Abstraction_4007, AbstractionEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Usage_4008(Package container) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements()
-				.iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Usage) {
-				continue;
-			}
-			Usage link = (Usage) linkObject;
-			if (UsageEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Usage_4008, UsageEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Deployment_4009(Package container) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements()
-				.iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Deployment) {
-				continue;
-			}
-			Deployment link = (Deployment) linkObject;
-			if (DeploymentEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Deployment_4009, DeploymentEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Dependency_4017(Package container) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements()
-				.iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Dependency) {
-				continue;
-			}
-			Dependency link = (Dependency) linkObject;
-			if (RoleBindingEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_4017, RoleBindingEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Dependency_4010(Package container) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements()
-				.iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Dependency) {
-				continue;
-			}
-			Dependency link = (Dependency) linkObject;
-			if (DependencyEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_4010, DependencyEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Connector_4013(StructuredClassifier container) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getOwnedConnectors()
-				.iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Connector) {
-				continue;
-			}
-			Connector link = (Connector) linkObject;
-			if (ConnectorEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> targets = link.getEnds();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof ConnectorEnd) {
-				continue;
-			}
-			ConnectorEnd dst = (ConnectorEnd) theTarget;
-			List<?> sources = link.getEnds();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof ConnectorEnd) {
-				continue;
-			}
-			ConnectorEnd src = (ConnectorEnd) theSource;
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Connector_4013, ConnectorEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Generalization_4015(Classifier container) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getGeneralizations()
-				.iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Generalization) {
-				continue;
-			}
-			Generalization link = (Generalization) linkObject;
-			if (GeneralizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			Classifier dst = link.getGeneral();
-			Classifier src = link.getSpecific();
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Generalization_4015, GeneralizationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_InformationFlow_4021(Package container) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements()
-				.iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof InformationFlow) {
-				continue;
-			}
-			InformationFlow link = (InformationFlow) linkObject;
-			if (InformationFlowEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> targets = link.getInformationTargets();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getInformationSources();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InformationFlow_4021, InformationFlowEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(Element target, CrossReferenceAdapter crossReferencer) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
-		for (EStructuralFeature.Setting setting : settings) {
-			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getComment_AnnotatedElement()) {
-				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.CommentAnnotatedElement_4002, CommentAnnotatedElementEditPart.VISUAL_ID));
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(Element target, CrossReferenceAdapter crossReferencer) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
-		for (EStructuralFeature.Setting setting : settings) {
-			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getConstraint_ConstrainedElement()) {
-				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.ConstraintConstrainedElement_4003, ConstraintConstrainedElementEditPart.VISUAL_ID));
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_ComponentRealization_4004(NamedElement target, CrossReferenceAdapter crossReferencer) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
-		for (EStructuralFeature.Setting setting : settings) {
-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof ComponentRealization) {
-				continue;
-			}
-			ComponentRealization link = (ComponentRealization) setting.getEObject();
-			if (ComponentRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.ComponentRealization_4004, ComponentRealizationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_InterfaceRealization_4005(NamedElement target, CrossReferenceAdapter crossReferencer) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
-		for (EStructuralFeature.Setting setting : settings) {
-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof InterfaceRealization) {
-				continue;
-			}
-			InterfaceRealization link = (InterfaceRealization) setting.getEObject();
-			if (InterfaceRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.InterfaceRealization_4005, InterfaceRealizationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Substitution_4011(NamedElement target, CrossReferenceAdapter crossReferencer) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
-		for (EStructuralFeature.Setting setting : settings) {
-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Substitution) {
-				continue;
-			}
-			Substitution link = (Substitution) setting.getEObject();
-			if (SubstitutionEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Substitution_4011, SubstitutionEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Realization_4006(NamedElement target, CrossReferenceAdapter crossReferencer) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
-		for (EStructuralFeature.Setting setting : settings) {
-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Realization) {
-				continue;
-			}
-			Realization link = (Realization) setting.getEObject();
-			if (RealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Realization_4006, RealizationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Manifestation_4012(NamedElement target, CrossReferenceAdapter crossReferencer) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
-		for (EStructuralFeature.Setting setting : settings) {
-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Manifestation) {
-				continue;
-			}
-			Manifestation link = (Manifestation) setting.getEObject();
-			if (ManifestationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Manifestation_4012, ManifestationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Abstraction_4007(NamedElement target, CrossReferenceAdapter crossReferencer) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
-		for (EStructuralFeature.Setting setting : settings) {
-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Abstraction) {
-				continue;
-			}
-			Abstraction link = (Abstraction) setting.getEObject();
-			if (AbstractionEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Abstraction_4007, AbstractionEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Usage_4008(NamedElement target, CrossReferenceAdapter crossReferencer) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
-		for (EStructuralFeature.Setting setting : settings) {
-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Usage) {
-				continue;
-			}
-			Usage link = (Usage) setting.getEObject();
-			if (UsageEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Usage_4008, UsageEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Deployment_4009(NamedElement target, CrossReferenceAdapter crossReferencer) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
-		for (EStructuralFeature.Setting setting : settings) {
-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Deployment) {
-				continue;
-			}
-			Deployment link = (Deployment) setting.getEObject();
-			if (DeploymentEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Deployment_4009, DeploymentEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Dependency_4017(NamedElement target, CrossReferenceAdapter crossReferencer) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
-		for (EStructuralFeature.Setting setting : settings) {
-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Dependency) {
-				continue;
-			}
-			Dependency link = (Dependency) setting.getEObject();
-			if (RoleBindingEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_4017, RoleBindingEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Dependency_4010(NamedElement target, CrossReferenceAdapter crossReferencer) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
-		for (EStructuralFeature.Setting setting : settings) {
-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Dependency) {
-				continue;
-			}
-			Dependency link = (Dependency) setting.getEObject();
-			if (DependencyEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_4010, DependencyEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Generalization_4015(Classifier target, CrossReferenceAdapter crossReferencer) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
-		for (EStructuralFeature.Setting setting : settings) {
-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getGeneralization_General() || false == setting.getEObject() instanceof Generalization) {
-				continue;
-			}
-			Generalization link = (Generalization) setting.getEObject();
-			if (GeneralizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			Classifier src = link.getSpecific();
-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Generalization_4015, GeneralizationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(NamedElement target, CrossReferenceAdapter crossReferencer) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
-		for (EStructuralFeature.Setting setting : settings) {
-			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getTimeObservation_Event()) {
-				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.TimeObservationEvent_4018, TimeObservationEventEditPart.VISUAL_ID));
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(NamedElement target, CrossReferenceAdapter crossReferencer) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
-		for (EStructuralFeature.Setting setting : settings) {
-			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getDurationObservation_Event()) {
-				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.DurationObservationEvent_4019, DurationObservationEventEditPart.VISUAL_ID));
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(Classifier target, CrossReferenceAdapter crossReferencer) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
-		for (EStructuralFeature.Setting setting : settings) {
-			if (setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getInformationItem_Represented()) {
-				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.InformationItemRepresented_4020, RepresentationEditPart.VISUAL_ID));
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_InformationFlow_4021(NamedElement target, CrossReferenceAdapter crossReferencer) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);
-		for (EStructuralFeature.Setting setting : settings) {
-			if (setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getInformationFlow_InformationTarget() || false == setting.getEObject() instanceof InformationFlow) {
-				continue;
-			}
-			InformationFlow link = (InformationFlow) setting.getEObject();
-			if (InformationFlowEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> sources = link.getInformationSources();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.InformationFlow_4021, InformationFlowEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(Comment source) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> destinations = source.getAnnotatedElements()
-				.iterator(); destinations.hasNext();) {
-			Element destination = (Element) destinations.next();
-			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.CommentAnnotatedElement_4002, CommentAnnotatedElementEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(Constraint source) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> destinations = source.getConstrainedElements()
-				.iterator(); destinations.hasNext();) {
-			Element destination = (Element) destinations.next();
-			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.ConstraintConstrainedElement_4003, ConstraintConstrainedElementEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_ComponentRealization_4004(NamedElement source) {
-		Package container = null;
-		// Find container element for the link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				container = (Package) element;
-			}
-		}
-		if (container == null) {
-			return Collections.emptyList();
-		}
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements()
-				.iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof ComponentRealization) {
-				continue;
-			}
-			ComponentRealization link = (ComponentRealization) linkObject;
-			if (ComponentRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			if (src != source) {
-				continue;
-			}
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.ComponentRealization_4004, ComponentRealizationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(NamedElement source) {
-		Package container = null;
-		// Find container element for the link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				container = (Package) element;
-			}
-		}
-		if (container == null) {
-			return Collections.emptyList();
-		}
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements()
-				.iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof InterfaceRealization) {
-				continue;
-			}
-			InterfaceRealization link = (InterfaceRealization) linkObject;
-			if (InterfaceRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			if (src != source) {
-				continue;
-			}
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InterfaceRealization_4005, InterfaceRealizationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Substitution_4011(NamedElement source) {
-		Package container = null;
-		// Find container element for the link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				container = (Package) element;
-			}
-		}
-		if (container == null) {
-			return Collections.emptyList();
-		}
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements()
-				.iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Substitution) {
-				continue;
-			}
-			Substitution link = (Substitution) linkObject;
-			if (SubstitutionEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			if (src != source) {
-				continue;
-			}
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Substitution_4011, SubstitutionEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Realization_4006(NamedElement source) {
-		Package container = null;
-		// Find container element for the link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				container = (Package) element;
-			}
-		}
-		if (container == null) {
-			return Collections.emptyList();
-		}
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements()
-				.iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Realization) {
-				continue;
-			}
-			Realization link = (Realization) linkObject;
-			if (RealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			if (src != source) {
-				continue;
-			}
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Realization_4006, RealizationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Manifestation_4012(NamedElement source) {
-		Package container = null;
-		// Find container element for the link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				container = (Package) element;
-			}
-		}
-		if (container == null) {
-			return Collections.emptyList();
-		}
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements()
-				.iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Manifestation) {
-				continue;
-			}
-			Manifestation link = (Manifestation) linkObject;
-			if (ManifestationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			if (src != source) {
-				continue;
-			}
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Manifestation_4012, ManifestationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Abstraction_4007(NamedElement source) {
-		Package container = null;
-		// Find container element for the link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				container = (Package) element;
-			}
-		}
-		if (container == null) {
-			return Collections.emptyList();
-		}
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements()
-				.iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Abstraction) {
-				continue;
-			}
-			Abstraction link = (Abstraction) linkObject;
-			if (AbstractionEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			if (src != source) {
-				continue;
-			}
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Abstraction_4007, AbstractionEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Usage_4008(NamedElement source) {
-		Package container = null;
-		// Find container element for the link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				container = (Package) element;
-			}
-		}
-		if (container == null) {
-			return Collections.emptyList();
-		}
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements()
-				.iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Usage) {
-				continue;
-			}
-			Usage link = (Usage) linkObject;
-			if (UsageEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			if (src != source) {
-				continue;
-			}
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Usage_4008, UsageEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Deployment_4009(NamedElement source) {
-		Package container = null;
-		// Find container element for the link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				container = (Package) element;
-			}
-		}
-		if (container == null) {
-			return Collections.emptyList();
-		}
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements()
-				.iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Deployment) {
-				continue;
-			}
-			Deployment link = (Deployment) linkObject;
-			if (DeploymentEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			if (src != source) {
-				continue;
-			}
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Deployment_4009, DeploymentEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Dependency_4017(NamedElement source) {
-		Package container = null;
-		// Find container element for the link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				container = (Package) element;
-			}
-		}
-		if (container == null) {
-			return Collections.emptyList();
-		}
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements()
-				.iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Dependency) {
-				continue;
-			}
-			Dependency link = (Dependency) linkObject;
-			if (RoleBindingEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			if (src != source) {
-				continue;
-			}
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_4017, RoleBindingEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Dependency_4010(NamedElement source) {
-		Package container = null;
-		// Find container element for the link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				container = (Package) element;
-			}
-		}
-		if (container == null) {
-			return Collections.emptyList();
-		}
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements()
-				.iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Dependency) {
-				continue;
-			}
-			Dependency link = (Dependency) linkObject;
-			if (DependencyEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> targets = link.getSuppliers();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getClients();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			if (src != source) {
-				continue;
-			}
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_4010, DependencyEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Generalization_4015(Classifier source) {
-		Classifier container = null;
-		// Find container element for the link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {
-			if (element instanceof Classifier) {
-				container = (Classifier) element;
-			}
-		}
-		if (container == null) {
-			return Collections.emptyList();
-		}
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getGeneralizations()
-				.iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof Generalization) {
-				continue;
-			}
-			Generalization link = (Generalization) linkObject;
-			if (GeneralizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			Classifier dst = link.getGeneral();
-			Classifier src = link.getSpecific();
-			if (src != source) {
-				continue;
-			}
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Generalization_4015, GeneralizationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_TimeObservation_Event_4018(TimeObservation source) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		NamedElement destination = source.getEvent();
-		if (destination == null) {
-			return result;
-		}
-		result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.TimeObservationEvent_4018, TimeObservationEventEditPart.VISUAL_ID));
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_DurationObservation_Event_4019(DurationObservation source) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> destinations = source.getEvents()
-				.iterator(); destinations.hasNext();) {
-			NamedElement destination = (NamedElement) destinations.next();
-			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.DurationObservationEvent_4019, DurationObservationEventEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020(InformationItem source) {
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> destinations = source.getRepresenteds()
-				.iterator(); destinations.hasNext();) {
-			Classifier destination = (Classifier) destinations.next();
-			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.InformationItemRepresented_4020, RepresentationEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_InformationFlow_4021(NamedElement source) {
-		Package container = null;
-		// Find container element for the link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (EObject element = source; element != null && container == null; element = element.eContainer()) {
-			if (element instanceof Package) {
-				container = (Package) element;
-			}
-		}
-		if (container == null) {
-			return Collections.emptyList();
-		}
-		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();
-		for (Iterator<?> links = container.getPackagedElements()
-				.iterator(); links.hasNext();) {
-			EObject linkObject = (EObject) links.next();
-			if (false == linkObject instanceof InformationFlow) {
-				continue;
-			}
-			InformationFlow link = (InformationFlow) linkObject;
-			if (InformationFlowEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {
-				continue;
-			}
-			List<?> targets = link.getInformationTargets();
-			Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-			if (false == theTarget instanceof NamedElement) {
-				continue;
-			}
-			NamedElement dst = (NamedElement) theTarget;
-			List<?> sources = link.getInformationSources();
-			Object theSource = sources.size() == 1 ? sources.get(0) : null;
-			if (false == theSource instanceof NamedElement) {
-				continue;
-			}
-			NamedElement src = (NamedElement) theSource;
-			if (src != source) {
-				continue;
-			}
-			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InformationFlow_4021, InformationFlowEditPart.VISUAL_ID));
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static final DiagramUpdater TYPED_INSTANCE = new DiagramUpdater() {
-		/**
-		 * @generated
-		 */
-		public List<UMLNodeDescriptor> getSemanticChildren(View view) {
-			return UMLDiagramUpdater.getSemanticChildren(view);
-		}
-
-		/**
-		 * @generated
-		 */
-		public List<UMLLinkDescriptor> getContainedLinks(View view) {
-			return UMLDiagramUpdater.getContainedLinks(view);
-		}
-
-		/**
-		 * @generated
-		 */
-		public List<UMLLinkDescriptor> getIncomingLinks(View view) {
-			return UMLDiagramUpdater.getIncomingLinks(view);
-		}
-
-		/**
-		 * @generated
-		 */
-		public List<UMLLinkDescriptor> getOutgoingLinks(View view) {
-			return UMLDiagramUpdater.getOutgoingLinks(view);
-		}
-	};
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.part;

+

+import java.util.Collection;

+import java.util.Collections;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EStructuralFeature;

+import org.eclipse.gmf.runtime.emf.core.util.CrossReferenceAdapter;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.update.DiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.common.part.ICustomDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.composite.custom.parts.PropertyDiagramUpdater;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.*;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.uml2.uml.Abstraction;

+import org.eclipse.uml2.uml.Activity;

+import org.eclipse.uml2.uml.Actor;

+import org.eclipse.uml2.uml.AnyReceiveEvent;

+import org.eclipse.uml2.uml.Artifact;

+import org.eclipse.uml2.uml.CallEvent;

+import org.eclipse.uml2.uml.ChangeEvent;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.Classifier;

+import org.eclipse.uml2.uml.Collaboration;

+import org.eclipse.uml2.uml.CollaborationUse;

+import org.eclipse.uml2.uml.Comment;

+import org.eclipse.uml2.uml.Component;

+import org.eclipse.uml2.uml.ComponentRealization;

+import org.eclipse.uml2.uml.ConnectableElement;

+import org.eclipse.uml2.uml.Connector;

+import org.eclipse.uml2.uml.ConnectorEnd;

+import org.eclipse.uml2.uml.Constraint;

+import org.eclipse.uml2.uml.DataType;

+import org.eclipse.uml2.uml.Dependency;

+import org.eclipse.uml2.uml.Deployment;

+import org.eclipse.uml2.uml.DeploymentSpecification;

+import org.eclipse.uml2.uml.Device;

+import org.eclipse.uml2.uml.Duration;

+import org.eclipse.uml2.uml.DurationConstraint;

+import org.eclipse.uml2.uml.DurationInterval;

+import org.eclipse.uml2.uml.DurationObservation;

+import org.eclipse.uml2.uml.Element;

+import org.eclipse.uml2.uml.Enumeration;

+import org.eclipse.uml2.uml.EnumerationLiteral;

+import org.eclipse.uml2.uml.ExecutionEnvironment;

+import org.eclipse.uml2.uml.Expression;

+import org.eclipse.uml2.uml.FunctionBehavior;

+import org.eclipse.uml2.uml.Generalization;

+import org.eclipse.uml2.uml.InformationFlow;

+import org.eclipse.uml2.uml.InformationItem;

+import org.eclipse.uml2.uml.InstanceValue;

+import org.eclipse.uml2.uml.Interaction;

+import org.eclipse.uml2.uml.InteractionConstraint;

+import org.eclipse.uml2.uml.Interface;

+import org.eclipse.uml2.uml.InterfaceRealization;

+import org.eclipse.uml2.uml.Interval;

+import org.eclipse.uml2.uml.IntervalConstraint;

+import org.eclipse.uml2.uml.LiteralBoolean;

+import org.eclipse.uml2.uml.LiteralInteger;

+import org.eclipse.uml2.uml.LiteralNull;

+import org.eclipse.uml2.uml.LiteralString;

+import org.eclipse.uml2.uml.LiteralUnlimitedNatural;

+import org.eclipse.uml2.uml.Manifestation;

+import org.eclipse.uml2.uml.NamedElement;

+import org.eclipse.uml2.uml.Node;

+import org.eclipse.uml2.uml.OpaqueBehavior;

+import org.eclipse.uml2.uml.OpaqueExpression;

+import org.eclipse.uml2.uml.Operation;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.PackageableElement;

+import org.eclipse.uml2.uml.Parameter;

+import org.eclipse.uml2.uml.Port;

+import org.eclipse.uml2.uml.PrimitiveType;

+import org.eclipse.uml2.uml.Property;

+import org.eclipse.uml2.uml.ProtocolStateMachine;

+import org.eclipse.uml2.uml.Realization;

+import org.eclipse.uml2.uml.Signal;

+import org.eclipse.uml2.uml.SignalEvent;

+import org.eclipse.uml2.uml.StateMachine;

+import org.eclipse.uml2.uml.StringExpression;

+import org.eclipse.uml2.uml.StructuredClassifier;

+import org.eclipse.uml2.uml.Substitution;

+import org.eclipse.uml2.uml.TimeConstraint;

+import org.eclipse.uml2.uml.TimeEvent;

+import org.eclipse.uml2.uml.TimeExpression;

+import org.eclipse.uml2.uml.TimeInterval;

+import org.eclipse.uml2.uml.TimeObservation;

+import org.eclipse.uml2.uml.UMLPackage;

+import org.eclipse.uml2.uml.Usage;

+import org.eclipse.uml2.uml.UseCase;

+

+/**

+ * @generated

+ */

+public class UMLDiagramUpdater implements DiagramUpdater {

+

+	/**

+	 * @generated

+	 */

+	public static final org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramUpdater INSTANCE = new UMLDiagramUpdater();

+

+	/**

+	 * @generated

+	 */

+	protected UMLDiagramUpdater() {

+		//to prevent instantiation allowing the override

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getSemanticChildren(View view) {

+		switch(UMLVisualIDRegistry.getVisualID(view)) {

+		case CompositeStructureDiagramEditPart.VISUAL_ID:

+			return getPackage_1000SemanticChildren(view);

+		case ActivityCompositeEditPart.VISUAL_ID:

+			return getActivity_2060SemanticChildren(view);

+		case InteractionCompositeEditPart.VISUAL_ID:

+			return getInteraction_2061SemanticChildren(view);

+		case ProtocolStateMachineCompositeEditPart.VISUAL_ID:

+			return getProtocolStateMachine_2062SemanticChildren(view);

+		case StateMachineCompositeEditPart.VISUAL_ID:

+			return getStateMachine_2063SemanticChildren(view);

+		case FunctionBehaviorCompositeEditPart.VISUAL_ID:

+			return getFunctionBehavior_2064SemanticChildren(view);

+		case OpaqueBehaviorCompositeEditPart.VISUAL_ID:

+			return getOpaqueBehavior_2065SemanticChildren(view);

+		case ComponentCompositeEditPart.VISUAL_ID:

+			return getComponent_2069SemanticChildren(view);

+		case DeviceCompositeEditPart.VISUAL_ID:

+			return getDevice_2070SemanticChildren(view);

+		case ExecutionEnvironmentCompositeEditPart.VISUAL_ID:

+			return getExecutionEnvironment_2071SemanticChildren(view);

+		case NodeCompositeEditPart.VISUAL_ID:

+			return getNode_2072SemanticChildren(view);

+		case ClassCompositeEditPart.VISUAL_ID:

+			return getClass_2073SemanticChildren(view);

+		case EnumerationEditPart.VISUAL_ID:

+			return getEnumeration_2067SemanticChildren(view);

+		case PropertyPartEditPartCN.VISUAL_ID:

+			return getProperty_3070SemanticChildren(view);

+		case ActivityCompositeEditPartCN.VISUAL_ID:

+			return getActivity_3072SemanticChildren(view);

+		case InteractionCompositeEditPartCN.VISUAL_ID:

+			return getInteraction_3073SemanticChildren(view);

+		case ProtocolStateMachineCompositeEditPartCN.VISUAL_ID:

+			return getProtocolStateMachine_3074SemanticChildren(view);

+		case StateMachineCompositeEditPartCN.VISUAL_ID:

+			return getStateMachine_3075SemanticChildren(view);

+		case FunctionBehaviorCompositeEditPartCN.VISUAL_ID:

+			return getFunctionBehavior_3076SemanticChildren(view);

+		case OpaqueBehaviorCompositeEditPartCN.VISUAL_ID:

+			return getOpaqueBehavior_3077SemanticChildren(view);

+		case ComponentCompositeEditPartCN.VISUAL_ID:

+			return getComponent_3081SemanticChildren(view);

+		case DeviceCompositeEditPartCN.VISUAL_ID:

+			return getDevice_3082SemanticChildren(view);

+		case ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID:

+			return getExecutionEnvironment_3083SemanticChildren(view);

+		case NodeCompositeEditPartCN.VISUAL_ID:

+			return getNode_3084SemanticChildren(view);

+		case ClassCompositeEditPartCN.VISUAL_ID:

+			return getClass_3085SemanticChildren(view);

+		case EnumerationEditPartCN.VISUAL_ID:

+			return getEnumeration_3079SemanticChildren(view);

+		case DataTypeAttributeCompartmentEditPart.VISUAL_ID:

+			return getDataTypeAttributes_7033SemanticChildren(view);

+		case DataTypeOperationCompartmentEditPart.VISUAL_ID:

+			return getDataTypeOperations_7034SemanticChildren(view);

+		case DataTypeAttributeCompartmentEditPartCN.VISUAL_ID:

+			return getDataTypeAttributes_7036SemanticChildren(view);

+		case DataTypeOperationCompartmentEditPartCN.VISUAL_ID:

+			return getDataTypeOperations_7037SemanticChildren(view);

+		case EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID:

+			return getEnumerationLiterals_7048SemanticChildren(view);

+		case EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID:

+			return getEnumerationLiterals_7049SemanticChildren(view);

+		case ActivityCompositeCompartmentEditPartCN.VISUAL_ID:

+			return getActivityInternalstructure_7050SemanticChildren(view);

+		case InteractionCompositeCompartmentEditPartCN.VISUAL_ID:

+			return getInteractionInternalstructure_7051SemanticChildren(view);

+		case ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID:

+			return getProtocolStateMachineInternalstructure_7052SemanticChildren(view);

+		case StateMachineCompositeCompartmentEditPartCN.VISUAL_ID:

+			return getStateMachineInternalstructure_7053SemanticChildren(view);

+		case FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:

+			return getFunctionBehaviorInternalstructure_7054SemanticChildren(view);

+		case OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:

+			return getOpaqueBehaviorInternalstructure_7055SemanticChildren(view);

+		case ComponentCompositeCompartmentEditPartCN.VISUAL_ID:

+			return getComponentInternalstructure_7056SemanticChildren(view);

+		case DeviceCompositeCompartmentEditPartCN.VISUAL_ID:

+			return getDeviceInternalstructure_7057SemanticChildren(view);

+		case ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID:

+			return getExecutionEnvironmentInternalstructure_7058SemanticChildren(view);

+		case NodeCompositeCompartmentEditPartCN.VISUAL_ID:

+			return getNodeInternalstructure_7059SemanticChildren(view);

+		case ClassCompositeCompartmentEditPartCN.VISUAL_ID:

+			return getClassInternalstructure_7060SemanticChildren(view);

+		case CollaborationCompositeCompartmentEditPartCN.VISUAL_ID:

+			return getCollaborationInternalstructure_7061SemanticChildren(view);

+		case ActivityCompositeCompartmentEditPart.VISUAL_ID:

+			return getActivityInternalstructure_7063SemanticChildren(view);

+		case InteractionCompositeCompartmentEditPart.VISUAL_ID:

+			return getInteractionInternalstructure_7064SemanticChildren(view);

+		case ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID:

+			return getProtocolStateMachineInternalstructure_7065SemanticChildren(view);

+		case StateMachineCompositeCompartmentEditPart.VISUAL_ID:

+			return getStateMachineInternalstructure_7066SemanticChildren(view);

+		case FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID:

+			return getFunctionBehaviorInternalstructure_7067SemanticChildren(view);

+		case OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID:

+			return getOpaqueBehaviorInternalstructure_7068SemanticChildren(view);

+		case ComponentCompositeCompartmentEditPart.VISUAL_ID:

+			return getComponentInternalstructure_7069SemanticChildren(view);

+		case DeviceCompositeCompartmentEditPart.VISUAL_ID:

+			return getDeviceInternalstructure_7070SemanticChildren(view);

+		case ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID:

+			return getExecutionEnvironmentInternalstructure_7071SemanticChildren(view);

+		case NodeCompositeCompartmentEditPart.VISUAL_ID:

+			return getNodeInternalstructure_7072SemanticChildren(view);

+		case ClassCompositeCompartmentEditPart.VISUAL_ID:

+			return getClassInternalstructure_7073SemanticChildren(view);

+		case CollaborationCompositeCompartmentEditPart.VISUAL_ID:

+			return getCollaborationInternalstructure_7075SemanticChildren(view);

+		case PropertyPartCompartmentEditPartCN.VISUAL_ID:

+			return getPropertyInternalstructure_7077SemanticChildren(view);

+		}

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getPackage_1000SemanticChildren(View view) {

+		if(!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Package modelElement = (Package)view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getPackagedElements().iterator(); it.hasNext();) {

+			PackageableElement childElement = (PackageableElement)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ActivityCompositeEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionCompositeEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ProtocolStateMachineCompositeEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == StateMachineCompositeEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == FunctionBehaviorCompositeEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == OpaqueBehaviorCompositeEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ComponentCompositeEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeviceCompositeEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ExecutionEnvironmentCompositeEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == NodeCompositeEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ClassCompositeEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == CollaborationCompositeEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InterfaceEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == PrimitiveTypeEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == EnumerationEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DataTypeEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ActorEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeploymentSpecificationEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ArtifactEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InformationItemEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == SignalEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == UseCaseEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == SignalEventEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == CallEventEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == AnyReceiveEventEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ChangeEventEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeEventEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DurationObservationEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeObservationEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == LiteralBooleanEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == LiteralIntegerEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == LiteralNullEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == LiteralStringEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == LiteralUnlimitedNaturalEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == StringExpressionEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == OpaqueExpressionEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeExpressionEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ExpressionEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DurationEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeIntervalEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DurationIntervalEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == IntervalEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InstanceValueEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CommentEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == DurationConstraintEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeConstraintEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == IntervalConstraintEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionConstraintEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ConstraintEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getActivity_2060SemanticChildren(View view) {

+		if(!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Activity modelElement = (Activity)view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PortEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ParameterEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getInteraction_2061SemanticChildren(View view) {

+		if(!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Interaction modelElement = (Interaction)view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PortEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ParameterEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getProtocolStateMachine_2062SemanticChildren(View view) {

+		if(!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ProtocolStateMachine modelElement = (ProtocolStateMachine)view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PortEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ParameterEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getStateMachine_2063SemanticChildren(View view) {

+		if(!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		StateMachine modelElement = (StateMachine)view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PortEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ParameterEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getFunctionBehavior_2064SemanticChildren(View view) {

+		if(!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		FunctionBehavior modelElement = (FunctionBehavior)view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PortEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ParameterEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getOpaqueBehavior_2065SemanticChildren(View view) {

+		if(!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		OpaqueBehavior modelElement = (OpaqueBehavior)view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PortEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ParameterEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getComponent_2069SemanticChildren(View view) {

+		if(!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Component modelElement = (Component)view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PortEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getDevice_2070SemanticChildren(View view) {

+		if(!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Device modelElement = (Device)view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PortEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getExecutionEnvironment_2071SemanticChildren(View view) {

+		if(!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ExecutionEnvironment modelElement = (ExecutionEnvironment)view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PortEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getNode_2072SemanticChildren(View view) {

+		if(!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Node modelElement = (Node)view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PortEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getClass_2073SemanticChildren(View view) {

+		if(!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Class modelElement = (Class)view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PortEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getEnumeration_2067SemanticChildren(View view) {

+		if(!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Enumeration modelElement = (Enumeration)view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedLiterals().iterator(); it.hasNext();) {

+			EnumerationLiteral childElement = (EnumerationLiteral)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == EnumerationLiteralEditPartCLN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getProperty_3070SemanticChildren(View view) {

+		ICustomDiagramUpdater<UMLNodeDescriptor> customUpdater = new PropertyDiagramUpdater();

+		return customUpdater.getSemanticChildren(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getActivity_3072SemanticChildren(View view) {

+		if(!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Activity modelElement = (Activity)view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PortEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ParameterEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getInteraction_3073SemanticChildren(View view) {

+		if(!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Interaction modelElement = (Interaction)view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PortEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ParameterEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getProtocolStateMachine_3074SemanticChildren(View view) {

+		if(!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ProtocolStateMachine modelElement = (ProtocolStateMachine)view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PortEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ParameterEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getStateMachine_3075SemanticChildren(View view) {

+		if(!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		StateMachine modelElement = (StateMachine)view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PortEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ParameterEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getFunctionBehavior_3076SemanticChildren(View view) {

+		if(!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		FunctionBehavior modelElement = (FunctionBehavior)view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PortEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ParameterEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getOpaqueBehavior_3077SemanticChildren(View view) {

+		if(!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		OpaqueBehavior modelElement = (OpaqueBehavior)view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PortEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ParameterEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getComponent_3081SemanticChildren(View view) {

+		if(!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Component modelElement = (Component)view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PortEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getDevice_3082SemanticChildren(View view) {

+		if(!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Device modelElement = (Device)view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PortEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getExecutionEnvironment_3083SemanticChildren(View view) {

+		if(!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ExecutionEnvironment modelElement = (ExecutionEnvironment)view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PortEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getNode_3084SemanticChildren(View view) {

+		if(!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Node modelElement = (Node)view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PortEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getClass_3085SemanticChildren(View view) {

+		if(!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Class modelElement = (Class)view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PortEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getEnumeration_3079SemanticChildren(View view) {

+		if(!view.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Enumeration modelElement = (Enumeration)view.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedLiterals().iterator(); it.hasNext();) {

+			EnumerationLiteral childElement = (EnumerationLiteral)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == EnumerationLiteralEditPartCLN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getDataTypeAttributes_7033SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		DataType modelElement = (DataType)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyEditPartCLN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getDataTypeOperations_7034SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		DataType modelElement = (DataType)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) {

+			Operation childElement = (Operation)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == OperationEditPartCLN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getDataTypeAttributes_7036SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		DataType modelElement = (DataType)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyEditPartCLN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getDataTypeOperations_7037SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		DataType modelElement = (DataType)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedOperations().iterator(); it.hasNext();) {

+			Operation childElement = (Operation)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == OperationEditPartCLN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getEnumerationLiterals_7048SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Enumeration modelElement = (Enumeration)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedLiterals().iterator(); it.hasNext();) {

+			EnumerationLiteral childElement = (EnumerationLiteral)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == EnumerationLiteralEditPartCLN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getEnumerationLiterals_7049SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Enumeration modelElement = (Enumeration)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedLiterals().iterator(); it.hasNext();) {

+			EnumerationLiteral childElement = (EnumerationLiteral)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == EnumerationLiteralEditPartCLN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getActivityInternalstructure_7050SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Activity modelElement = (Activity)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ParameterEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getInteractionInternalstructure_7051SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Interaction modelElement = (Interaction)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ParameterEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getProtocolStateMachineInternalstructure_7052SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ProtocolStateMachine modelElement = (ProtocolStateMachine)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ParameterEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getStateMachineInternalstructure_7053SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		StateMachine modelElement = (StateMachine)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ParameterEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getFunctionBehaviorInternalstructure_7054SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		FunctionBehavior modelElement = (FunctionBehavior)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ParameterEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getOpaqueBehaviorInternalstructure_7055SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		OpaqueBehavior modelElement = (OpaqueBehavior)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ParameterEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getComponentInternalstructure_7056SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Component modelElement = (Component)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getDeviceInternalstructure_7057SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Device modelElement = (Device)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getExecutionEnvironmentInternalstructure_7058SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ExecutionEnvironment modelElement = (ExecutionEnvironment)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getNodeInternalstructure_7059SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Node modelElement = (Node)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getClassInternalstructure_7060SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Class modelElement = (Class)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getCollaborationInternalstructure_7061SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Collaboration modelElement = (Collaboration)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getRoles().iterator(); it.hasNext();) {

+			ConnectableElement childElement = (ConnectableElement)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CollaborationRoleEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getActivityInternalstructure_7063SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Activity modelElement = (Activity)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ParameterEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getInteractionInternalstructure_7064SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Interaction modelElement = (Interaction)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ParameterEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getProtocolStateMachineInternalstructure_7065SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ProtocolStateMachine modelElement = (ProtocolStateMachine)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ParameterEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getStateMachineInternalstructure_7066SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		StateMachine modelElement = (StateMachine)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ParameterEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getFunctionBehaviorInternalstructure_7067SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		FunctionBehavior modelElement = (FunctionBehavior)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ParameterEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getOpaqueBehaviorInternalstructure_7068SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		OpaqueBehavior modelElement = (OpaqueBehavior)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedParameters().iterator(); it.hasNext();) {

+			Parameter childElement = (Parameter)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ParameterEditPart.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getComponentInternalstructure_7069SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Component modelElement = (Component)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getDeviceInternalstructure_7070SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Device modelElement = (Device)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getExecutionEnvironmentInternalstructure_7071SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		ExecutionEnvironment modelElement = (ExecutionEnvironment)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getNodeInternalstructure_7072SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Node modelElement = (Node)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getClassInternalstructure_7073SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Class modelElement = (Class)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getNestedClassifiers().iterator(); it.hasNext();) {

+			Classifier childElement = (Classifier)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ActivityCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ProtocolStateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == StateMachineCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == FunctionBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == OpaqueBehaviorCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ComponentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeviceCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == NodeCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ClassCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == CollaborationCompositeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InterfaceEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == PrimitiveTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == EnumerationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DataTypeEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ActorEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DeploymentSpecificationEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ArtifactEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InformationItemEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == SignalEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == UseCaseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getCollaborationInternalstructure_7075SemanticChildren(View view) {

+		if(false == view.eContainer() instanceof View) {

+			return Collections.emptyList();

+		}

+		View containerView = (View)view.eContainer();

+		if(!containerView.isSetElement()) {

+			return Collections.emptyList();

+		}

+		Collaboration modelElement = (Collaboration)containerView.getElement();

+		LinkedList<UMLNodeDescriptor> result = new LinkedList<UMLNodeDescriptor>();

+		for(Iterator<?> it = modelElement.getOwnedAttributes().iterator(); it.hasNext();) {

+			Property childElement = (Property)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == PropertyPartEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getCollaborationUses().iterator(); it.hasNext();) {

+			CollaborationUse childElement = (CollaborationUse)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CollaborationUseEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedComments().iterator(); it.hasNext();) {

+			Comment childElement = (Comment)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CommentEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getRoles().iterator(); it.hasNext();) {

+			ConnectableElement childElement = (ConnectableElement)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == CollaborationRoleEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		for(Iterator<?> it = modelElement.getOwnedRules().iterator(); it.hasNext();) {

+			Constraint childElement = (Constraint)it.next();

+			int visualID = UMLVisualIDRegistry.getNodeVisualID(view, childElement);

+			if(visualID == DurationConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == TimeConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == IntervalConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == InteractionConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+			if(visualID == ConstraintEditPartCN.VISUAL_ID) {

+				result.add(new UMLNodeDescriptor(childElement, visualID));

+				continue;

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLNodeDescriptor> getPropertyInternalstructure_7077SemanticChildren(View view) {

+		ICustomDiagramUpdater<UMLNodeDescriptor> customUpdater = new PropertyDiagramUpdater();

+		return customUpdater.getSemanticChildren(view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getContainedLinks(View view) {

+		switch(UMLVisualIDRegistry.getVisualID(view)) {

+		case CompositeStructureDiagramEditPart.VISUAL_ID:

+			return getPackage_1000ContainedLinks(view);

+		case ActivityCompositeEditPart.VISUAL_ID:

+			return getActivity_2060ContainedLinks(view);

+		case InteractionCompositeEditPart.VISUAL_ID:

+			return getInteraction_2061ContainedLinks(view);

+		case ProtocolStateMachineCompositeEditPart.VISUAL_ID:

+			return getProtocolStateMachine_2062ContainedLinks(view);

+		case StateMachineCompositeEditPart.VISUAL_ID:

+			return getStateMachine_2063ContainedLinks(view);

+		case FunctionBehaviorCompositeEditPart.VISUAL_ID:

+			return getFunctionBehavior_2064ContainedLinks(view);

+		case OpaqueBehaviorCompositeEditPart.VISUAL_ID:

+			return getOpaqueBehavior_2065ContainedLinks(view);

+		case ComponentCompositeEditPart.VISUAL_ID:

+			return getComponent_2069ContainedLinks(view);

+		case DeviceCompositeEditPart.VISUAL_ID:

+			return getDevice_2070ContainedLinks(view);

+		case ExecutionEnvironmentCompositeEditPart.VISUAL_ID:

+			return getExecutionEnvironment_2071ContainedLinks(view);

+		case NodeCompositeEditPart.VISUAL_ID:

+			return getNode_2072ContainedLinks(view);

+		case ClassCompositeEditPart.VISUAL_ID:

+			return getClass_2073ContainedLinks(view);

+		case CollaborationCompositeEditPart.VISUAL_ID:

+			return getCollaboration_2075ContainedLinks(view);

+		case InterfaceEditPart.VISUAL_ID:

+			return getInterface_2076ContainedLinks(view);

+		case PrimitiveTypeEditPart.VISUAL_ID:

+			return getPrimitiveType_2066ContainedLinks(view);

+		case EnumerationEditPart.VISUAL_ID:

+			return getEnumeration_2067ContainedLinks(view);

+		case DataTypeEditPart.VISUAL_ID:

+			return getDataType_2068ContainedLinks(view);

+		case ActorEditPart.VISUAL_ID:

+			return getActor_2077ContainedLinks(view);

+		case DeploymentSpecificationEditPart.VISUAL_ID:

+			return getDeploymentSpecification_2078ContainedLinks(view);

+		case ArtifactEditPart.VISUAL_ID:

+			return getArtifact_2079ContainedLinks(view);

+		case InformationItemEditPart.VISUAL_ID:

+			return getInformationItem_2080ContainedLinks(view);

+		case SignalEditPart.VISUAL_ID:

+			return getSignal_2081ContainedLinks(view);

+		case UseCaseEditPart.VISUAL_ID:

+			return getUseCase_2082ContainedLinks(view);

+		case SignalEventEditPart.VISUAL_ID:

+			return getSignalEvent_2083ContainedLinks(view);

+		case CallEventEditPart.VISUAL_ID:

+			return getCallEvent_2084ContainedLinks(view);

+		case AnyReceiveEventEditPart.VISUAL_ID:

+			return getAnyReceiveEvent_2085ContainedLinks(view);

+		case ChangeEventEditPart.VISUAL_ID:

+			return getChangeEvent_2088ContainedLinks(view);

+		case TimeEventEditPart.VISUAL_ID:

+			return getTimeEvent_2089ContainedLinks(view);

+		case DurationObservationEditPart.VISUAL_ID:

+			return getDurationObservation_2093ContainedLinks(view);

+		case TimeObservationEditPart.VISUAL_ID:

+			return getTimeObservation_2094ContainedLinks(view);

+		case LiteralBooleanEditPart.VISUAL_ID:

+			return getLiteralBoolean_2095ContainedLinks(view);

+		case LiteralIntegerEditPart.VISUAL_ID:

+			return getLiteralInteger_2096ContainedLinks(view);

+		case LiteralNullEditPart.VISUAL_ID:

+			return getLiteralNull_2097ContainedLinks(view);

+		case LiteralStringEditPart.VISUAL_ID:

+			return getLiteralString_2098ContainedLinks(view);

+		case LiteralUnlimitedNaturalEditPart.VISUAL_ID:

+			return getLiteralUnlimitedNatural_2099ContainedLinks(view);

+		case StringExpressionEditPart.VISUAL_ID:

+			return getStringExpression_2100ContainedLinks(view);

+		case OpaqueExpressionEditPart.VISUAL_ID:

+			return getOpaqueExpression_2101ContainedLinks(view);

+		case TimeExpressionEditPart.VISUAL_ID:

+			return getTimeExpression_2102ContainedLinks(view);

+		case ExpressionEditPart.VISUAL_ID:

+			return getExpression_2103ContainedLinks(view);

+		case DurationEditPart.VISUAL_ID:

+			return getDuration_2104ContainedLinks(view);

+		case TimeIntervalEditPart.VISUAL_ID:

+			return getTimeInterval_2105ContainedLinks(view);

+		case DurationIntervalEditPart.VISUAL_ID:

+			return getDurationInterval_2106ContainedLinks(view);

+		case IntervalEditPart.VISUAL_ID:

+			return getInterval_2107ContainedLinks(view);

+		case InstanceValueEditPart.VISUAL_ID:

+			return getInstanceValue_2108ContainedLinks(view);

+		case CommentEditPart.VISUAL_ID:

+			return getComment_2109ContainedLinks(view);

+		case DurationConstraintEditPart.VISUAL_ID:

+			return getDurationConstraint_2110ContainedLinks(view);

+		case TimeConstraintEditPart.VISUAL_ID:

+			return getTimeConstraint_2111ContainedLinks(view);

+		case IntervalConstraintEditPart.VISUAL_ID:

+			return getIntervalConstraint_2112ContainedLinks(view);

+		case InteractionConstraintEditPart.VISUAL_ID:

+			return getInteractionConstraint_2113ContainedLinks(view);

+		case ConstraintEditPart.VISUAL_ID:

+			return getConstraint_2114ContainedLinks(view);

+		case PortEditPart.VISUAL_ID:

+			return getPort_3069ContainedLinks(view);

+		case ParameterEditPart.VISUAL_ID:

+			return getParameter_3088ContainedLinks(view);

+		case PropertyPartEditPartCN.VISUAL_ID:

+			return getProperty_3070ContainedLinks(view);

+		case CollaborationRoleEditPartCN.VISUAL_ID:

+			return getConnectableElement_3115ContainedLinks(view);

+		case CollaborationUseEditPartCN.VISUAL_ID:

+			return getCollaborationUse_3071ContainedLinks(view);

+		case ActivityCompositeEditPartCN.VISUAL_ID:

+			return getActivity_3072ContainedLinks(view);

+		case InteractionCompositeEditPartCN.VISUAL_ID:

+			return getInteraction_3073ContainedLinks(view);

+		case ProtocolStateMachineCompositeEditPartCN.VISUAL_ID:

+			return getProtocolStateMachine_3074ContainedLinks(view);

+		case StateMachineCompositeEditPartCN.VISUAL_ID:

+			return getStateMachine_3075ContainedLinks(view);

+		case FunctionBehaviorCompositeEditPartCN.VISUAL_ID:

+			return getFunctionBehavior_3076ContainedLinks(view);

+		case OpaqueBehaviorCompositeEditPartCN.VISUAL_ID:

+			return getOpaqueBehavior_3077ContainedLinks(view);

+		case ComponentCompositeEditPartCN.VISUAL_ID:

+			return getComponent_3081ContainedLinks(view);

+		case DeviceCompositeEditPartCN.VISUAL_ID:

+			return getDevice_3082ContainedLinks(view);

+		case ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID:

+			return getExecutionEnvironment_3083ContainedLinks(view);

+		case NodeCompositeEditPartCN.VISUAL_ID:

+			return getNode_3084ContainedLinks(view);

+		case ClassCompositeEditPartCN.VISUAL_ID:

+			return getClass_3085ContainedLinks(view);

+		case CollaborationCompositeEditPartCN.VISUAL_ID:

+			return getCollaboration_3086ContainedLinks(view);

+		case InterfaceEditPartCN.VISUAL_ID:

+			return getInterface_3087ContainedLinks(view);

+		case PrimitiveTypeEditPartCN.VISUAL_ID:

+			return getPrimitiveType_3078ContainedLinks(view);

+		case EnumerationEditPartCN.VISUAL_ID:

+			return getEnumeration_3079ContainedLinks(view);

+		case DataTypeEditPartCN.VISUAL_ID:

+			return getDataType_3080ContainedLinks(view);

+		case ActorEditPartCN.VISUAL_ID:

+			return getActor_3091ContainedLinks(view);

+		case DeploymentSpecificationEditPartCN.VISUAL_ID:

+			return getDeploymentSpecification_3092ContainedLinks(view);

+		case ArtifactEditPartCN.VISUAL_ID:

+			return getArtifact_3093ContainedLinks(view);

+		case InformationItemEditPartCN.VISUAL_ID:

+			return getInformationItem_3094ContainedLinks(view);

+		case SignalEditPartCN.VISUAL_ID:

+			return getSignal_3095ContainedLinks(view);

+		case UseCaseEditPartCN.VISUAL_ID:

+			return getUseCase_3096ContainedLinks(view);

+		case CommentEditPartCN.VISUAL_ID:

+			return getComment_3097ContainedLinks(view);

+		case DurationConstraintEditPartCN.VISUAL_ID:

+			return getDurationConstraint_3116ContainedLinks(view);

+		case TimeConstraintEditPartCN.VISUAL_ID:

+			return getTimeConstraint_3117ContainedLinks(view);

+		case IntervalConstraintEditPartCN.VISUAL_ID:

+			return getIntervalConstraint_3118ContainedLinks(view);

+		case InteractionConstraintEditPartCN.VISUAL_ID:

+			return getInteractionConstraint_3119ContainedLinks(view);

+		case ConstraintEditPartCN.VISUAL_ID:

+			return getConstraint_3120ContainedLinks(view);

+		case PropertyEditPartCLN.VISUAL_ID:

+			return getProperty_3101ContainedLinks(view);

+		case OperationEditPartCLN.VISUAL_ID:

+			return getOperation_3102ContainedLinks(view);

+		case EnumerationLiteralEditPartCLN.VISUAL_ID:

+			return getEnumerationLiteral_3066ContainedLinks(view);

+		case ComponentRealizationEditPart.VISUAL_ID:

+			return getComponentRealization_4004ContainedLinks(view);

+		case InterfaceRealizationEditPart.VISUAL_ID:

+			return getInterfaceRealization_4005ContainedLinks(view);

+		case SubstitutionEditPart.VISUAL_ID:

+			return getSubstitution_4011ContainedLinks(view);

+		case RealizationEditPart.VISUAL_ID:

+			return getRealization_4006ContainedLinks(view);

+		case ManifestationEditPart.VISUAL_ID:

+			return getManifestation_4012ContainedLinks(view);

+		case AbstractionEditPart.VISUAL_ID:

+			return getAbstraction_4007ContainedLinks(view);

+		case UsageEditPart.VISUAL_ID:

+			return getUsage_4008ContainedLinks(view);

+		case DeploymentEditPart.VISUAL_ID:

+			return getDeployment_4009ContainedLinks(view);

+		case RoleBindingEditPart.VISUAL_ID:

+			return getDependency_4017ContainedLinks(view);

+		case DependencyEditPart.VISUAL_ID:

+			return getDependency_4010ContainedLinks(view);

+		case ConnectorEditPart.VISUAL_ID:

+			return getConnector_4013ContainedLinks(view);

+		case GeneralizationEditPart.VISUAL_ID:

+			return getGeneralization_4015ContainedLinks(view);

+		case InformationFlowEditPart.VISUAL_ID:

+			return getInformationFlow_4021ContainedLinks(view);

+		}

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getIncomingLinks(View view) {

+		switch(UMLVisualIDRegistry.getVisualID(view)) {

+		case ActivityCompositeEditPart.VISUAL_ID:

+			return getActivity_2060IncomingLinks(view);

+		case InteractionCompositeEditPart.VISUAL_ID:

+			return getInteraction_2061IncomingLinks(view);

+		case ProtocolStateMachineCompositeEditPart.VISUAL_ID:

+			return getProtocolStateMachine_2062IncomingLinks(view);

+		case StateMachineCompositeEditPart.VISUAL_ID:

+			return getStateMachine_2063IncomingLinks(view);

+		case FunctionBehaviorCompositeEditPart.VISUAL_ID:

+			return getFunctionBehavior_2064IncomingLinks(view);

+		case OpaqueBehaviorCompositeEditPart.VISUAL_ID:

+			return getOpaqueBehavior_2065IncomingLinks(view);

+		case ComponentCompositeEditPart.VISUAL_ID:

+			return getComponent_2069IncomingLinks(view);

+		case DeviceCompositeEditPart.VISUAL_ID:

+			return getDevice_2070IncomingLinks(view);

+		case ExecutionEnvironmentCompositeEditPart.VISUAL_ID:

+			return getExecutionEnvironment_2071IncomingLinks(view);

+		case NodeCompositeEditPart.VISUAL_ID:

+			return getNode_2072IncomingLinks(view);

+		case ClassCompositeEditPart.VISUAL_ID:

+			return getClass_2073IncomingLinks(view);

+		case CollaborationCompositeEditPart.VISUAL_ID:

+			return getCollaboration_2075IncomingLinks(view);

+		case InterfaceEditPart.VISUAL_ID:

+			return getInterface_2076IncomingLinks(view);

+		case PrimitiveTypeEditPart.VISUAL_ID:

+			return getPrimitiveType_2066IncomingLinks(view);

+		case EnumerationEditPart.VISUAL_ID:

+			return getEnumeration_2067IncomingLinks(view);

+		case DataTypeEditPart.VISUAL_ID:

+			return getDataType_2068IncomingLinks(view);

+		case ActorEditPart.VISUAL_ID:

+			return getActor_2077IncomingLinks(view);

+		case DeploymentSpecificationEditPart.VISUAL_ID:

+			return getDeploymentSpecification_2078IncomingLinks(view);

+		case ArtifactEditPart.VISUAL_ID:

+			return getArtifact_2079IncomingLinks(view);

+		case InformationItemEditPart.VISUAL_ID:

+			return getInformationItem_2080IncomingLinks(view);

+		case SignalEditPart.VISUAL_ID:

+			return getSignal_2081IncomingLinks(view);

+		case UseCaseEditPart.VISUAL_ID:

+			return getUseCase_2082IncomingLinks(view);

+		case SignalEventEditPart.VISUAL_ID:

+			return getSignalEvent_2083IncomingLinks(view);

+		case CallEventEditPart.VISUAL_ID:

+			return getCallEvent_2084IncomingLinks(view);

+		case AnyReceiveEventEditPart.VISUAL_ID:

+			return getAnyReceiveEvent_2085IncomingLinks(view);

+		case ChangeEventEditPart.VISUAL_ID:

+			return getChangeEvent_2088IncomingLinks(view);

+		case TimeEventEditPart.VISUAL_ID:

+			return getTimeEvent_2089IncomingLinks(view);

+		case DurationObservationEditPart.VISUAL_ID:

+			return getDurationObservation_2093IncomingLinks(view);

+		case TimeObservationEditPart.VISUAL_ID:

+			return getTimeObservation_2094IncomingLinks(view);

+		case LiteralBooleanEditPart.VISUAL_ID:

+			return getLiteralBoolean_2095IncomingLinks(view);

+		case LiteralIntegerEditPart.VISUAL_ID:

+			return getLiteralInteger_2096IncomingLinks(view);

+		case LiteralNullEditPart.VISUAL_ID:

+			return getLiteralNull_2097IncomingLinks(view);

+		case LiteralStringEditPart.VISUAL_ID:

+			return getLiteralString_2098IncomingLinks(view);

+		case LiteralUnlimitedNaturalEditPart.VISUAL_ID:

+			return getLiteralUnlimitedNatural_2099IncomingLinks(view);

+		case StringExpressionEditPart.VISUAL_ID:

+			return getStringExpression_2100IncomingLinks(view);

+		case OpaqueExpressionEditPart.VISUAL_ID:

+			return getOpaqueExpression_2101IncomingLinks(view);

+		case TimeExpressionEditPart.VISUAL_ID:

+			return getTimeExpression_2102IncomingLinks(view);

+		case ExpressionEditPart.VISUAL_ID:

+			return getExpression_2103IncomingLinks(view);

+		case DurationEditPart.VISUAL_ID:

+			return getDuration_2104IncomingLinks(view);

+		case TimeIntervalEditPart.VISUAL_ID:

+			return getTimeInterval_2105IncomingLinks(view);

+		case DurationIntervalEditPart.VISUAL_ID:

+			return getDurationInterval_2106IncomingLinks(view);

+		case IntervalEditPart.VISUAL_ID:

+			return getInterval_2107IncomingLinks(view);

+		case InstanceValueEditPart.VISUAL_ID:

+			return getInstanceValue_2108IncomingLinks(view);

+		case CommentEditPart.VISUAL_ID:

+			return getComment_2109IncomingLinks(view);

+		case DurationConstraintEditPart.VISUAL_ID:

+			return getDurationConstraint_2110IncomingLinks(view);

+		case TimeConstraintEditPart.VISUAL_ID:

+			return getTimeConstraint_2111IncomingLinks(view);

+		case IntervalConstraintEditPart.VISUAL_ID:

+			return getIntervalConstraint_2112IncomingLinks(view);

+		case InteractionConstraintEditPart.VISUAL_ID:

+			return getInteractionConstraint_2113IncomingLinks(view);

+		case ConstraintEditPart.VISUAL_ID:

+			return getConstraint_2114IncomingLinks(view);

+		case PortEditPart.VISUAL_ID:

+			return getPort_3069IncomingLinks(view);

+		case ParameterEditPart.VISUAL_ID:

+			return getParameter_3088IncomingLinks(view);

+		case PropertyPartEditPartCN.VISUAL_ID:

+			return getProperty_3070IncomingLinks(view);

+		case CollaborationRoleEditPartCN.VISUAL_ID:

+			return getConnectableElement_3115IncomingLinks(view);

+		case CollaborationUseEditPartCN.VISUAL_ID:

+			return getCollaborationUse_3071IncomingLinks(view);

+		case ActivityCompositeEditPartCN.VISUAL_ID:

+			return getActivity_3072IncomingLinks(view);

+		case InteractionCompositeEditPartCN.VISUAL_ID:

+			return getInteraction_3073IncomingLinks(view);

+		case ProtocolStateMachineCompositeEditPartCN.VISUAL_ID:

+			return getProtocolStateMachine_3074IncomingLinks(view);

+		case StateMachineCompositeEditPartCN.VISUAL_ID:

+			return getStateMachine_3075IncomingLinks(view);

+		case FunctionBehaviorCompositeEditPartCN.VISUAL_ID:

+			return getFunctionBehavior_3076IncomingLinks(view);

+		case OpaqueBehaviorCompositeEditPartCN.VISUAL_ID:

+			return getOpaqueBehavior_3077IncomingLinks(view);

+		case ComponentCompositeEditPartCN.VISUAL_ID:

+			return getComponent_3081IncomingLinks(view);

+		case DeviceCompositeEditPartCN.VISUAL_ID:

+			return getDevice_3082IncomingLinks(view);

+		case ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID:

+			return getExecutionEnvironment_3083IncomingLinks(view);

+		case NodeCompositeEditPartCN.VISUAL_ID:

+			return getNode_3084IncomingLinks(view);

+		case ClassCompositeEditPartCN.VISUAL_ID:

+			return getClass_3085IncomingLinks(view);

+		case CollaborationCompositeEditPartCN.VISUAL_ID:

+			return getCollaboration_3086IncomingLinks(view);

+		case InterfaceEditPartCN.VISUAL_ID:

+			return getInterface_3087IncomingLinks(view);

+		case PrimitiveTypeEditPartCN.VISUAL_ID:

+			return getPrimitiveType_3078IncomingLinks(view);

+		case EnumerationEditPartCN.VISUAL_ID:

+			return getEnumeration_3079IncomingLinks(view);

+		case DataTypeEditPartCN.VISUAL_ID:

+			return getDataType_3080IncomingLinks(view);

+		case ActorEditPartCN.VISUAL_ID:

+			return getActor_3091IncomingLinks(view);

+		case DeploymentSpecificationEditPartCN.VISUAL_ID:

+			return getDeploymentSpecification_3092IncomingLinks(view);

+		case ArtifactEditPartCN.VISUAL_ID:

+			return getArtifact_3093IncomingLinks(view);

+		case InformationItemEditPartCN.VISUAL_ID:

+			return getInformationItem_3094IncomingLinks(view);

+		case SignalEditPartCN.VISUAL_ID:

+			return getSignal_3095IncomingLinks(view);

+		case UseCaseEditPartCN.VISUAL_ID:

+			return getUseCase_3096IncomingLinks(view);

+		case CommentEditPartCN.VISUAL_ID:

+			return getComment_3097IncomingLinks(view);

+		case DurationConstraintEditPartCN.VISUAL_ID:

+			return getDurationConstraint_3116IncomingLinks(view);

+		case TimeConstraintEditPartCN.VISUAL_ID:

+			return getTimeConstraint_3117IncomingLinks(view);

+		case IntervalConstraintEditPartCN.VISUAL_ID:

+			return getIntervalConstraint_3118IncomingLinks(view);

+		case InteractionConstraintEditPartCN.VISUAL_ID:

+			return getInteractionConstraint_3119IncomingLinks(view);

+		case ConstraintEditPartCN.VISUAL_ID:

+			return getConstraint_3120IncomingLinks(view);

+		case PropertyEditPartCLN.VISUAL_ID:

+			return getProperty_3101IncomingLinks(view);

+		case OperationEditPartCLN.VISUAL_ID:

+			return getOperation_3102IncomingLinks(view);

+		case EnumerationLiteralEditPartCLN.VISUAL_ID:

+			return getEnumerationLiteral_3066IncomingLinks(view);

+		case ComponentRealizationEditPart.VISUAL_ID:

+			return getComponentRealization_4004IncomingLinks(view);

+		case InterfaceRealizationEditPart.VISUAL_ID:

+			return getInterfaceRealization_4005IncomingLinks(view);

+		case SubstitutionEditPart.VISUAL_ID:

+			return getSubstitution_4011IncomingLinks(view);

+		case RealizationEditPart.VISUAL_ID:

+			return getRealization_4006IncomingLinks(view);

+		case ManifestationEditPart.VISUAL_ID:

+			return getManifestation_4012IncomingLinks(view);

+		case AbstractionEditPart.VISUAL_ID:

+			return getAbstraction_4007IncomingLinks(view);

+		case UsageEditPart.VISUAL_ID:

+			return getUsage_4008IncomingLinks(view);

+		case DeploymentEditPart.VISUAL_ID:

+			return getDeployment_4009IncomingLinks(view);

+		case RoleBindingEditPart.VISUAL_ID:

+			return getDependency_4017IncomingLinks(view);

+		case DependencyEditPart.VISUAL_ID:

+			return getDependency_4010IncomingLinks(view);

+		case ConnectorEditPart.VISUAL_ID:

+			return getConnector_4013IncomingLinks(view);

+		case GeneralizationEditPart.VISUAL_ID:

+			return getGeneralization_4015IncomingLinks(view);

+		case InformationFlowEditPart.VISUAL_ID:

+			return getInformationFlow_4021IncomingLinks(view);

+		}

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getOutgoingLinks(View view) {

+		switch(UMLVisualIDRegistry.getVisualID(view)) {

+		case ActivityCompositeEditPart.VISUAL_ID:

+			return getActivity_2060OutgoingLinks(view);

+		case InteractionCompositeEditPart.VISUAL_ID:

+			return getInteraction_2061OutgoingLinks(view);

+		case ProtocolStateMachineCompositeEditPart.VISUAL_ID:

+			return getProtocolStateMachine_2062OutgoingLinks(view);

+		case StateMachineCompositeEditPart.VISUAL_ID:

+			return getStateMachine_2063OutgoingLinks(view);

+		case FunctionBehaviorCompositeEditPart.VISUAL_ID:

+			return getFunctionBehavior_2064OutgoingLinks(view);

+		case OpaqueBehaviorCompositeEditPart.VISUAL_ID:

+			return getOpaqueBehavior_2065OutgoingLinks(view);

+		case ComponentCompositeEditPart.VISUAL_ID:

+			return getComponent_2069OutgoingLinks(view);

+		case DeviceCompositeEditPart.VISUAL_ID:

+			return getDevice_2070OutgoingLinks(view);

+		case ExecutionEnvironmentCompositeEditPart.VISUAL_ID:

+			return getExecutionEnvironment_2071OutgoingLinks(view);

+		case NodeCompositeEditPart.VISUAL_ID:

+			return getNode_2072OutgoingLinks(view);

+		case ClassCompositeEditPart.VISUAL_ID:

+			return getClass_2073OutgoingLinks(view);

+		case CollaborationCompositeEditPart.VISUAL_ID:

+			return getCollaboration_2075OutgoingLinks(view);

+		case InterfaceEditPart.VISUAL_ID:

+			return getInterface_2076OutgoingLinks(view);

+		case PrimitiveTypeEditPart.VISUAL_ID:

+			return getPrimitiveType_2066OutgoingLinks(view);

+		case EnumerationEditPart.VISUAL_ID:

+			return getEnumeration_2067OutgoingLinks(view);

+		case DataTypeEditPart.VISUAL_ID:

+			return getDataType_2068OutgoingLinks(view);

+		case ActorEditPart.VISUAL_ID:

+			return getActor_2077OutgoingLinks(view);

+		case DeploymentSpecificationEditPart.VISUAL_ID:

+			return getDeploymentSpecification_2078OutgoingLinks(view);

+		case ArtifactEditPart.VISUAL_ID:

+			return getArtifact_2079OutgoingLinks(view);

+		case InformationItemEditPart.VISUAL_ID:

+			return getInformationItem_2080OutgoingLinks(view);

+		case SignalEditPart.VISUAL_ID:

+			return getSignal_2081OutgoingLinks(view);

+		case UseCaseEditPart.VISUAL_ID:

+			return getUseCase_2082OutgoingLinks(view);

+		case SignalEventEditPart.VISUAL_ID:

+			return getSignalEvent_2083OutgoingLinks(view);

+		case CallEventEditPart.VISUAL_ID:

+			return getCallEvent_2084OutgoingLinks(view);

+		case AnyReceiveEventEditPart.VISUAL_ID:

+			return getAnyReceiveEvent_2085OutgoingLinks(view);

+		case ChangeEventEditPart.VISUAL_ID:

+			return getChangeEvent_2088OutgoingLinks(view);

+		case TimeEventEditPart.VISUAL_ID:

+			return getTimeEvent_2089OutgoingLinks(view);

+		case DurationObservationEditPart.VISUAL_ID:

+			return getDurationObservation_2093OutgoingLinks(view);

+		case TimeObservationEditPart.VISUAL_ID:

+			return getTimeObservation_2094OutgoingLinks(view);

+		case LiteralBooleanEditPart.VISUAL_ID:

+			return getLiteralBoolean_2095OutgoingLinks(view);

+		case LiteralIntegerEditPart.VISUAL_ID:

+			return getLiteralInteger_2096OutgoingLinks(view);

+		case LiteralNullEditPart.VISUAL_ID:

+			return getLiteralNull_2097OutgoingLinks(view);

+		case LiteralStringEditPart.VISUAL_ID:

+			return getLiteralString_2098OutgoingLinks(view);

+		case LiteralUnlimitedNaturalEditPart.VISUAL_ID:

+			return getLiteralUnlimitedNatural_2099OutgoingLinks(view);

+		case StringExpressionEditPart.VISUAL_ID:

+			return getStringExpression_2100OutgoingLinks(view);

+		case OpaqueExpressionEditPart.VISUAL_ID:

+			return getOpaqueExpression_2101OutgoingLinks(view);

+		case TimeExpressionEditPart.VISUAL_ID:

+			return getTimeExpression_2102OutgoingLinks(view);

+		case ExpressionEditPart.VISUAL_ID:

+			return getExpression_2103OutgoingLinks(view);

+		case DurationEditPart.VISUAL_ID:

+			return getDuration_2104OutgoingLinks(view);

+		case TimeIntervalEditPart.VISUAL_ID:

+			return getTimeInterval_2105OutgoingLinks(view);

+		case DurationIntervalEditPart.VISUAL_ID:

+			return getDurationInterval_2106OutgoingLinks(view);

+		case IntervalEditPart.VISUAL_ID:

+			return getInterval_2107OutgoingLinks(view);

+		case InstanceValueEditPart.VISUAL_ID:

+			return getInstanceValue_2108OutgoingLinks(view);

+		case CommentEditPart.VISUAL_ID:

+			return getComment_2109OutgoingLinks(view);

+		case DurationConstraintEditPart.VISUAL_ID:

+			return getDurationConstraint_2110OutgoingLinks(view);

+		case TimeConstraintEditPart.VISUAL_ID:

+			return getTimeConstraint_2111OutgoingLinks(view);

+		case IntervalConstraintEditPart.VISUAL_ID:

+			return getIntervalConstraint_2112OutgoingLinks(view);

+		case InteractionConstraintEditPart.VISUAL_ID:

+			return getInteractionConstraint_2113OutgoingLinks(view);

+		case ConstraintEditPart.VISUAL_ID:

+			return getConstraint_2114OutgoingLinks(view);

+		case PortEditPart.VISUAL_ID:

+			return getPort_3069OutgoingLinks(view);

+		case ParameterEditPart.VISUAL_ID:

+			return getParameter_3088OutgoingLinks(view);

+		case PropertyPartEditPartCN.VISUAL_ID:

+			return getProperty_3070OutgoingLinks(view);

+		case CollaborationRoleEditPartCN.VISUAL_ID:

+			return getConnectableElement_3115OutgoingLinks(view);

+		case CollaborationUseEditPartCN.VISUAL_ID:

+			return getCollaborationUse_3071OutgoingLinks(view);

+		case ActivityCompositeEditPartCN.VISUAL_ID:

+			return getActivity_3072OutgoingLinks(view);

+		case InteractionCompositeEditPartCN.VISUAL_ID:

+			return getInteraction_3073OutgoingLinks(view);

+		case ProtocolStateMachineCompositeEditPartCN.VISUAL_ID:

+			return getProtocolStateMachine_3074OutgoingLinks(view);

+		case StateMachineCompositeEditPartCN.VISUAL_ID:

+			return getStateMachine_3075OutgoingLinks(view);

+		case FunctionBehaviorCompositeEditPartCN.VISUAL_ID:

+			return getFunctionBehavior_3076OutgoingLinks(view);

+		case OpaqueBehaviorCompositeEditPartCN.VISUAL_ID:

+			return getOpaqueBehavior_3077OutgoingLinks(view);

+		case ComponentCompositeEditPartCN.VISUAL_ID:

+			return getComponent_3081OutgoingLinks(view);

+		case DeviceCompositeEditPartCN.VISUAL_ID:

+			return getDevice_3082OutgoingLinks(view);

+		case ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID:

+			return getExecutionEnvironment_3083OutgoingLinks(view);

+		case NodeCompositeEditPartCN.VISUAL_ID:

+			return getNode_3084OutgoingLinks(view);

+		case ClassCompositeEditPartCN.VISUAL_ID:

+			return getClass_3085OutgoingLinks(view);

+		case CollaborationCompositeEditPartCN.VISUAL_ID:

+			return getCollaboration_3086OutgoingLinks(view);

+		case InterfaceEditPartCN.VISUAL_ID:

+			return getInterface_3087OutgoingLinks(view);

+		case PrimitiveTypeEditPartCN.VISUAL_ID:

+			return getPrimitiveType_3078OutgoingLinks(view);

+		case EnumerationEditPartCN.VISUAL_ID:

+			return getEnumeration_3079OutgoingLinks(view);

+		case DataTypeEditPartCN.VISUAL_ID:

+			return getDataType_3080OutgoingLinks(view);

+		case ActorEditPartCN.VISUAL_ID:

+			return getActor_3091OutgoingLinks(view);

+		case DeploymentSpecificationEditPartCN.VISUAL_ID:

+			return getDeploymentSpecification_3092OutgoingLinks(view);

+		case ArtifactEditPartCN.VISUAL_ID:

+			return getArtifact_3093OutgoingLinks(view);

+		case InformationItemEditPartCN.VISUAL_ID:

+			return getInformationItem_3094OutgoingLinks(view);

+		case SignalEditPartCN.VISUAL_ID:

+			return getSignal_3095OutgoingLinks(view);

+		case UseCaseEditPartCN.VISUAL_ID:

+			return getUseCase_3096OutgoingLinks(view);

+		case CommentEditPartCN.VISUAL_ID:

+			return getComment_3097OutgoingLinks(view);

+		case DurationConstraintEditPartCN.VISUAL_ID:

+			return getDurationConstraint_3116OutgoingLinks(view);

+		case TimeConstraintEditPartCN.VISUAL_ID:

+			return getTimeConstraint_3117OutgoingLinks(view);

+		case IntervalConstraintEditPartCN.VISUAL_ID:

+			return getIntervalConstraint_3118OutgoingLinks(view);

+		case InteractionConstraintEditPartCN.VISUAL_ID:

+			return getInteractionConstraint_3119OutgoingLinks(view);

+		case ConstraintEditPartCN.VISUAL_ID:

+			return getConstraint_3120OutgoingLinks(view);

+		case PropertyEditPartCLN.VISUAL_ID:

+			return getProperty_3101OutgoingLinks(view);

+		case OperationEditPartCLN.VISUAL_ID:

+			return getOperation_3102OutgoingLinks(view);

+		case EnumerationLiteralEditPartCLN.VISUAL_ID:

+			return getEnumerationLiteral_3066OutgoingLinks(view);

+		case ComponentRealizationEditPart.VISUAL_ID:

+			return getComponentRealization_4004OutgoingLinks(view);

+		case InterfaceRealizationEditPart.VISUAL_ID:

+			return getInterfaceRealization_4005OutgoingLinks(view);

+		case SubstitutionEditPart.VISUAL_ID:

+			return getSubstitution_4011OutgoingLinks(view);

+		case RealizationEditPart.VISUAL_ID:

+			return getRealization_4006OutgoingLinks(view);

+		case ManifestationEditPart.VISUAL_ID:

+			return getManifestation_4012OutgoingLinks(view);

+		case AbstractionEditPart.VISUAL_ID:

+			return getAbstraction_4007OutgoingLinks(view);

+		case UsageEditPart.VISUAL_ID:

+			return getUsage_4008OutgoingLinks(view);

+		case DeploymentEditPart.VISUAL_ID:

+			return getDeployment_4009OutgoingLinks(view);

+		case RoleBindingEditPart.VISUAL_ID:

+			return getDependency_4017OutgoingLinks(view);

+		case DependencyEditPart.VISUAL_ID:

+			return getDependency_4010OutgoingLinks(view);

+		case ConnectorEditPart.VISUAL_ID:

+			return getConnector_4013OutgoingLinks(view);

+		case GeneralizationEditPart.VISUAL_ID:

+			return getGeneralization_4015OutgoingLinks(view);

+		case InformationFlowEditPart.VISUAL_ID:

+			return getInformationFlow_4021OutgoingLinks(view);

+		}

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getPackage_1000ContainedLinks(View view) {

+		Package modelElement = (Package)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getActivity_2060ContainedLinks(View view) {

+		Activity modelElement = (Activity)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInteraction_2061ContainedLinks(View view) {

+		Interaction modelElement = (Interaction)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getProtocolStateMachine_2062ContainedLinks(View view) {

+		ProtocolStateMachine modelElement = (ProtocolStateMachine)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getStateMachine_2063ContainedLinks(View view) {

+		StateMachine modelElement = (StateMachine)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getFunctionBehavior_2064ContainedLinks(View view) {

+		FunctionBehavior modelElement = (FunctionBehavior)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getOpaqueBehavior_2065ContainedLinks(View view) {

+		OpaqueBehavior modelElement = (OpaqueBehavior)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComponent_2069ContainedLinks(View view) {

+		Component modelElement = (Component)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDevice_2070ContainedLinks(View view) {

+		Device modelElement = (Device)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getExecutionEnvironment_2071ContainedLinks(View view) {

+		ExecutionEnvironment modelElement = (ExecutionEnvironment)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getNode_2072ContainedLinks(View view) {

+		Node modelElement = (Node)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getClass_2073ContainedLinks(View view) {

+		Class modelElement = (Class)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getCollaboration_2075ContainedLinks(View view) {

+		Collaboration modelElement = (Collaboration)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInterface_2076ContainedLinks(View view) {

+		Interface modelElement = (Interface)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getPrimitiveType_2066ContainedLinks(View view) {

+		PrimitiveType modelElement = (PrimitiveType)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getEnumeration_2067ContainedLinks(View view) {

+		Enumeration modelElement = (Enumeration)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDataType_2068ContainedLinks(View view) {

+		DataType modelElement = (DataType)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getActor_2077ContainedLinks(View view) {

+		Actor modelElement = (Actor)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDeploymentSpecification_2078ContainedLinks(View view) {

+		DeploymentSpecification modelElement = (DeploymentSpecification)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getArtifact_2079ContainedLinks(View view) {

+		Artifact modelElement = (Artifact)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInformationItem_2080ContainedLinks(View view) {

+		InformationItem modelElement = (InformationItem)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getSignal_2081ContainedLinks(View view) {

+		Signal modelElement = (Signal)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getUseCase_2082ContainedLinks(View view) {

+		UseCase modelElement = (UseCase)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getSignalEvent_2083ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getCallEvent_2084ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getAnyReceiveEvent_2085ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getChangeEvent_2088ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getTimeEvent_2089ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDurationObservation_2093ContainedLinks(View view) {

+		DurationObservation modelElement = (DurationObservation)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getTimeObservation_2094ContainedLinks(View view) {

+		TimeObservation modelElement = (TimeObservation)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getLiteralBoolean_2095ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getLiteralInteger_2096ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getLiteralNull_2097ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getLiteralString_2098ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getLiteralUnlimitedNatural_2099ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getStringExpression_2100ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getOpaqueExpression_2101ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getTimeExpression_2102ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getExpression_2103ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDuration_2104ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getTimeInterval_2105ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDurationInterval_2106ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInterval_2107ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInstanceValue_2108ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComment_2109ContainedLinks(View view) {

+		Comment modelElement = (Comment)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDurationConstraint_2110ContainedLinks(View view) {

+		DurationConstraint modelElement = (DurationConstraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getTimeConstraint_2111ContainedLinks(View view) {

+		TimeConstraint modelElement = (TimeConstraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getIntervalConstraint_2112ContainedLinks(View view) {

+		IntervalConstraint modelElement = (IntervalConstraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInteractionConstraint_2113ContainedLinks(View view) {

+		InteractionConstraint modelElement = (InteractionConstraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getConstraint_2114ContainedLinks(View view) {

+		Constraint modelElement = (Constraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getPort_3069ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getParameter_3088ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getProperty_3070ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getConnectableElement_3115ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getCollaborationUse_3071ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getActivity_3072ContainedLinks(View view) {

+		Activity modelElement = (Activity)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInteraction_3073ContainedLinks(View view) {

+		Interaction modelElement = (Interaction)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getProtocolStateMachine_3074ContainedLinks(View view) {

+		ProtocolStateMachine modelElement = (ProtocolStateMachine)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getStateMachine_3075ContainedLinks(View view) {

+		StateMachine modelElement = (StateMachine)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getFunctionBehavior_3076ContainedLinks(View view) {

+		FunctionBehavior modelElement = (FunctionBehavior)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getOpaqueBehavior_3077ContainedLinks(View view) {

+		OpaqueBehavior modelElement = (OpaqueBehavior)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComponent_3081ContainedLinks(View view) {

+		Component modelElement = (Component)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDevice_3082ContainedLinks(View view) {

+		Device modelElement = (Device)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getExecutionEnvironment_3083ContainedLinks(View view) {

+		ExecutionEnvironment modelElement = (ExecutionEnvironment)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getNode_3084ContainedLinks(View view) {

+		Node modelElement = (Node)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getClass_3085ContainedLinks(View view) {

+		Class modelElement = (Class)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getCollaboration_3086ContainedLinks(View view) {

+		Collaboration modelElement = (Collaboration)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Connector_4013(modelElement));

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInterface_3087ContainedLinks(View view) {

+		Interface modelElement = (Interface)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getPrimitiveType_3078ContainedLinks(View view) {

+		PrimitiveType modelElement = (PrimitiveType)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getEnumeration_3079ContainedLinks(View view) {

+		Enumeration modelElement = (Enumeration)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDataType_3080ContainedLinks(View view) {

+		DataType modelElement = (DataType)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getActor_3091ContainedLinks(View view) {

+		Actor modelElement = (Actor)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDeploymentSpecification_3092ContainedLinks(View view) {

+		DeploymentSpecification modelElement = (DeploymentSpecification)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getArtifact_3093ContainedLinks(View view) {

+		Artifact modelElement = (Artifact)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInformationItem_3094ContainedLinks(View view) {

+		InformationItem modelElement = (InformationItem)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getSignal_3095ContainedLinks(View view) {

+		Signal modelElement = (Signal)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getUseCase_3096ContainedLinks(View view) {

+		UseCase modelElement = (UseCase)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getContainedTypeModelFacetLinks_Generalization_4015(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComment_3097ContainedLinks(View view) {

+		Comment modelElement = (Comment)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDurationConstraint_3116ContainedLinks(View view) {

+		DurationConstraint modelElement = (DurationConstraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getTimeConstraint_3117ContainedLinks(View view) {

+		TimeConstraint modelElement = (TimeConstraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getIntervalConstraint_3118ContainedLinks(View view) {

+		IntervalConstraint modelElement = (IntervalConstraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInteractionConstraint_3119ContainedLinks(View view) {

+		InteractionConstraint modelElement = (InteractionConstraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getConstraint_3120ContainedLinks(View view) {

+		Constraint modelElement = (Constraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getProperty_3101ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getOperation_3102ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getEnumerationLiteral_3066ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComponentRealization_4004ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInterfaceRealization_4005ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getSubstitution_4011ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getRealization_4006ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getManifestation_4012ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getAbstraction_4007ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getUsage_4008ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDeployment_4009ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDependency_4017ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDependency_4010ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getConnector_4013ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getGeneralization_4015ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInformationFlow_4021ContainedLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getActivity_2060IncomingLinks(View view) {

+		Activity modelElement = (Activity)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInteraction_2061IncomingLinks(View view) {

+		Interaction modelElement = (Interaction)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getProtocolStateMachine_2062IncomingLinks(View view) {

+		ProtocolStateMachine modelElement = (ProtocolStateMachine)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getStateMachine_2063IncomingLinks(View view) {

+		StateMachine modelElement = (StateMachine)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getFunctionBehavior_2064IncomingLinks(View view) {

+		FunctionBehavior modelElement = (FunctionBehavior)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getOpaqueBehavior_2065IncomingLinks(View view) {

+		OpaqueBehavior modelElement = (OpaqueBehavior)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComponent_2069IncomingLinks(View view) {

+		Component modelElement = (Component)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDevice_2070IncomingLinks(View view) {

+		Device modelElement = (Device)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getExecutionEnvironment_2071IncomingLinks(View view) {

+		ExecutionEnvironment modelElement = (ExecutionEnvironment)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getNode_2072IncomingLinks(View view) {

+		Node modelElement = (Node)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getClass_2073IncomingLinks(View view) {

+		Class modelElement = (Class)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getCollaboration_2075IncomingLinks(View view) {

+		Collaboration modelElement = (Collaboration)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInterface_2076IncomingLinks(View view) {

+		Interface modelElement = (Interface)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getPrimitiveType_2066IncomingLinks(View view) {

+		PrimitiveType modelElement = (PrimitiveType)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getEnumeration_2067IncomingLinks(View view) {

+		Enumeration modelElement = (Enumeration)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDataType_2068IncomingLinks(View view) {

+		DataType modelElement = (DataType)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getActor_2077IncomingLinks(View view) {

+		Actor modelElement = (Actor)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDeploymentSpecification_2078IncomingLinks(View view) {

+		DeploymentSpecification modelElement = (DeploymentSpecification)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getArtifact_2079IncomingLinks(View view) {

+		Artifact modelElement = (Artifact)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInformationItem_2080IncomingLinks(View view) {

+		InformationItem modelElement = (InformationItem)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getSignal_2081IncomingLinks(View view) {

+		Signal modelElement = (Signal)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getUseCase_2082IncomingLinks(View view) {

+		UseCase modelElement = (UseCase)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getSignalEvent_2083IncomingLinks(View view) {

+		SignalEvent modelElement = (SignalEvent)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getCallEvent_2084IncomingLinks(View view) {

+		CallEvent modelElement = (CallEvent)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getAnyReceiveEvent_2085IncomingLinks(View view) {

+		AnyReceiveEvent modelElement = (AnyReceiveEvent)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getChangeEvent_2088IncomingLinks(View view) {

+		ChangeEvent modelElement = (ChangeEvent)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getTimeEvent_2089IncomingLinks(View view) {

+		TimeEvent modelElement = (TimeEvent)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDurationObservation_2093IncomingLinks(View view) {

+		DurationObservation modelElement = (DurationObservation)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getTimeObservation_2094IncomingLinks(View view) {

+		TimeObservation modelElement = (TimeObservation)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getLiteralBoolean_2095IncomingLinks(View view) {

+		LiteralBoolean modelElement = (LiteralBoolean)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getLiteralInteger_2096IncomingLinks(View view) {

+		LiteralInteger modelElement = (LiteralInteger)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getLiteralNull_2097IncomingLinks(View view) {

+		LiteralNull modelElement = (LiteralNull)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getLiteralString_2098IncomingLinks(View view) {

+		LiteralString modelElement = (LiteralString)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getLiteralUnlimitedNatural_2099IncomingLinks(View view) {

+		LiteralUnlimitedNatural modelElement = (LiteralUnlimitedNatural)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getStringExpression_2100IncomingLinks(View view) {

+		StringExpression modelElement = (StringExpression)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getOpaqueExpression_2101IncomingLinks(View view) {

+		OpaqueExpression modelElement = (OpaqueExpression)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getTimeExpression_2102IncomingLinks(View view) {

+		TimeExpression modelElement = (TimeExpression)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getExpression_2103IncomingLinks(View view) {

+		Expression modelElement = (Expression)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDuration_2104IncomingLinks(View view) {

+		Duration modelElement = (Duration)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getTimeInterval_2105IncomingLinks(View view) {

+		TimeInterval modelElement = (TimeInterval)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDurationInterval_2106IncomingLinks(View view) {

+		DurationInterval modelElement = (DurationInterval)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInterval_2107IncomingLinks(View view) {

+		Interval modelElement = (Interval)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInstanceValue_2108IncomingLinks(View view) {

+		InstanceValue modelElement = (InstanceValue)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComment_2109IncomingLinks(View view) {

+		Comment modelElement = (Comment)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDurationConstraint_2110IncomingLinks(View view) {

+		DurationConstraint modelElement = (DurationConstraint)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getTimeConstraint_2111IncomingLinks(View view) {

+		TimeConstraint modelElement = (TimeConstraint)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getIntervalConstraint_2112IncomingLinks(View view) {

+		IntervalConstraint modelElement = (IntervalConstraint)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInteractionConstraint_2113IncomingLinks(View view) {

+		InteractionConstraint modelElement = (InteractionConstraint)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getConstraint_2114IncomingLinks(View view) {

+		Constraint modelElement = (Constraint)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getPort_3069IncomingLinks(View view) {

+		Port modelElement = (Port)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getParameter_3088IncomingLinks(View view) {

+		Parameter modelElement = (Parameter)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getProperty_3070IncomingLinks(View view) {

+		Property modelElement = (Property)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getConnectableElement_3115IncomingLinks(View view) {

+		ConnectableElement modelElement = (ConnectableElement)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getCollaborationUse_3071IncomingLinks(View view) {

+		CollaborationUse modelElement = (CollaborationUse)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getActivity_3072IncomingLinks(View view) {

+		Activity modelElement = (Activity)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInteraction_3073IncomingLinks(View view) {

+		Interaction modelElement = (Interaction)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getProtocolStateMachine_3074IncomingLinks(View view) {

+		ProtocolStateMachine modelElement = (ProtocolStateMachine)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getStateMachine_3075IncomingLinks(View view) {

+		StateMachine modelElement = (StateMachine)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getFunctionBehavior_3076IncomingLinks(View view) {

+		FunctionBehavior modelElement = (FunctionBehavior)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getOpaqueBehavior_3077IncomingLinks(View view) {

+		OpaqueBehavior modelElement = (OpaqueBehavior)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComponent_3081IncomingLinks(View view) {

+		Component modelElement = (Component)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDevice_3082IncomingLinks(View view) {

+		Device modelElement = (Device)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getExecutionEnvironment_3083IncomingLinks(View view) {

+		ExecutionEnvironment modelElement = (ExecutionEnvironment)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getNode_3084IncomingLinks(View view) {

+		Node modelElement = (Node)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getClass_3085IncomingLinks(View view) {

+		Class modelElement = (Class)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getCollaboration_3086IncomingLinks(View view) {

+		Collaboration modelElement = (Collaboration)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInterface_3087IncomingLinks(View view) {

+		Interface modelElement = (Interface)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getPrimitiveType_3078IncomingLinks(View view) {

+		PrimitiveType modelElement = (PrimitiveType)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getEnumeration_3079IncomingLinks(View view) {

+		Enumeration modelElement = (Enumeration)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDataType_3080IncomingLinks(View view) {

+		DataType modelElement = (DataType)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getActor_3091IncomingLinks(View view) {

+		Actor modelElement = (Actor)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDeploymentSpecification_3092IncomingLinks(View view) {

+		DeploymentSpecification modelElement = (DeploymentSpecification)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getArtifact_3093IncomingLinks(View view) {

+		Artifact modelElement = (Artifact)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInformationItem_3094IncomingLinks(View view) {

+		InformationItem modelElement = (InformationItem)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getSignal_3095IncomingLinks(View view) {

+		Signal modelElement = (Signal)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getUseCase_3096IncomingLinks(View view) {

+		UseCase modelElement = (UseCase)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Generalization_4015(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComment_3097IncomingLinks(View view) {

+		Comment modelElement = (Comment)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDurationConstraint_3116IncomingLinks(View view) {

+		DurationConstraint modelElement = (DurationConstraint)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getTimeConstraint_3117IncomingLinks(View view) {

+		TimeConstraint modelElement = (TimeConstraint)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getIntervalConstraint_3118IncomingLinks(View view) {

+		IntervalConstraint modelElement = (IntervalConstraint)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInteractionConstraint_3119IncomingLinks(View view) {

+		InteractionConstraint modelElement = (InteractionConstraint)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getConstraint_3120IncomingLinks(View view) {

+		Constraint modelElement = (Constraint)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getProperty_3101IncomingLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getOperation_3102IncomingLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getEnumerationLiteral_3066IncomingLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComponentRealization_4004IncomingLinks(View view) {

+		ComponentRealization modelElement = (ComponentRealization)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInterfaceRealization_4005IncomingLinks(View view) {

+		InterfaceRealization modelElement = (InterfaceRealization)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getSubstitution_4011IncomingLinks(View view) {

+		Substitution modelElement = (Substitution)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getRealization_4006IncomingLinks(View view) {

+		Realization modelElement = (Realization)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getManifestation_4012IncomingLinks(View view) {

+		Manifestation modelElement = (Manifestation)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getAbstraction_4007IncomingLinks(View view) {

+		Abstraction modelElement = (Abstraction)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getUsage_4008IncomingLinks(View view) {

+		Usage modelElement = (Usage)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDeployment_4009IncomingLinks(View view) {

+		Deployment modelElement = (Deployment)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDependency_4017IncomingLinks(View view) {

+		Dependency modelElement = (Dependency)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDependency_4010IncomingLinks(View view) {

+		Dependency modelElement = (Dependency)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getConnector_4013IncomingLinks(View view) {

+		Connector modelElement = (Connector)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getGeneralization_4015IncomingLinks(View view) {

+		Generalization modelElement = (Generalization)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInformationFlow_4021IncomingLinks(View view) {

+		InformationFlow modelElement = (InformationFlow)view.getElement();

+		CrossReferenceAdapter crossReferencer = CrossReferenceAdapter.getCrossReferenceAdapter(view.eResource().getResourceSet());

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_ComponentRealization_4004(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InterfaceRealization_4005(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Substitution_4011(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Realization_4006(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Manifestation_4012(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Abstraction_4007(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Usage_4008(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Deployment_4009(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4017(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_Dependency_4010(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement, crossReferencer));

+		result.addAll(getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement, crossReferencer));

+		result.addAll(getIncomingTypeModelFacetLinks_InformationFlow_4021(modelElement, crossReferencer));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getActivity_2060OutgoingLinks(View view) {

+		Activity modelElement = (Activity)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInteraction_2061OutgoingLinks(View view) {

+		Interaction modelElement = (Interaction)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getProtocolStateMachine_2062OutgoingLinks(View view) {

+		ProtocolStateMachine modelElement = (ProtocolStateMachine)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getStateMachine_2063OutgoingLinks(View view) {

+		StateMachine modelElement = (StateMachine)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getFunctionBehavior_2064OutgoingLinks(View view) {

+		FunctionBehavior modelElement = (FunctionBehavior)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getOpaqueBehavior_2065OutgoingLinks(View view) {

+		OpaqueBehavior modelElement = (OpaqueBehavior)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComponent_2069OutgoingLinks(View view) {

+		Component modelElement = (Component)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDevice_2070OutgoingLinks(View view) {

+		Device modelElement = (Device)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getExecutionEnvironment_2071OutgoingLinks(View view) {

+		ExecutionEnvironment modelElement = (ExecutionEnvironment)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getNode_2072OutgoingLinks(View view) {

+		Node modelElement = (Node)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getClass_2073OutgoingLinks(View view) {

+		Class modelElement = (Class)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getCollaboration_2075OutgoingLinks(View view) {

+		Collaboration modelElement = (Collaboration)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInterface_2076OutgoingLinks(View view) {

+		Interface modelElement = (Interface)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getPrimitiveType_2066OutgoingLinks(View view) {

+		PrimitiveType modelElement = (PrimitiveType)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getEnumeration_2067OutgoingLinks(View view) {

+		Enumeration modelElement = (Enumeration)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDataType_2068OutgoingLinks(View view) {

+		DataType modelElement = (DataType)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getActor_2077OutgoingLinks(View view) {

+		Actor modelElement = (Actor)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDeploymentSpecification_2078OutgoingLinks(View view) {

+		DeploymentSpecification modelElement = (DeploymentSpecification)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getArtifact_2079OutgoingLinks(View view) {

+		Artifact modelElement = (Artifact)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInformationItem_2080OutgoingLinks(View view) {

+		InformationItem modelElement = (InformationItem)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getSignal_2081OutgoingLinks(View view) {

+		Signal modelElement = (Signal)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getUseCase_2082OutgoingLinks(View view) {

+		UseCase modelElement = (UseCase)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getSignalEvent_2083OutgoingLinks(View view) {

+		SignalEvent modelElement = (SignalEvent)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getCallEvent_2084OutgoingLinks(View view) {

+		CallEvent modelElement = (CallEvent)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getAnyReceiveEvent_2085OutgoingLinks(View view) {

+		AnyReceiveEvent modelElement = (AnyReceiveEvent)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getChangeEvent_2088OutgoingLinks(View view) {

+		ChangeEvent modelElement = (ChangeEvent)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getTimeEvent_2089OutgoingLinks(View view) {

+		TimeEvent modelElement = (TimeEvent)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDurationObservation_2093OutgoingLinks(View view) {

+		DurationObservation modelElement = (DurationObservation)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_DurationObservation_Event_4019(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getTimeObservation_2094OutgoingLinks(View view) {

+		TimeObservation modelElement = (TimeObservation)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_TimeObservation_Event_4018(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getLiteralBoolean_2095OutgoingLinks(View view) {

+		LiteralBoolean modelElement = (LiteralBoolean)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getLiteralInteger_2096OutgoingLinks(View view) {

+		LiteralInteger modelElement = (LiteralInteger)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getLiteralNull_2097OutgoingLinks(View view) {

+		LiteralNull modelElement = (LiteralNull)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getLiteralString_2098OutgoingLinks(View view) {

+		LiteralString modelElement = (LiteralString)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getLiteralUnlimitedNatural_2099OutgoingLinks(View view) {

+		LiteralUnlimitedNatural modelElement = (LiteralUnlimitedNatural)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getStringExpression_2100OutgoingLinks(View view) {

+		StringExpression modelElement = (StringExpression)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getOpaqueExpression_2101OutgoingLinks(View view) {

+		OpaqueExpression modelElement = (OpaqueExpression)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getTimeExpression_2102OutgoingLinks(View view) {

+		TimeExpression modelElement = (TimeExpression)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getExpression_2103OutgoingLinks(View view) {

+		Expression modelElement = (Expression)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDuration_2104OutgoingLinks(View view) {

+		Duration modelElement = (Duration)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getTimeInterval_2105OutgoingLinks(View view) {

+		TimeInterval modelElement = (TimeInterval)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDurationInterval_2106OutgoingLinks(View view) {

+		DurationInterval modelElement = (DurationInterval)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInterval_2107OutgoingLinks(View view) {

+		Interval modelElement = (Interval)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInstanceValue_2108OutgoingLinks(View view) {

+		InstanceValue modelElement = (InstanceValue)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComment_2109OutgoingLinks(View view) {

+		Comment modelElement = (Comment)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDurationConstraint_2110OutgoingLinks(View view) {

+		DurationConstraint modelElement = (DurationConstraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getTimeConstraint_2111OutgoingLinks(View view) {

+		TimeConstraint modelElement = (TimeConstraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getIntervalConstraint_2112OutgoingLinks(View view) {

+		IntervalConstraint modelElement = (IntervalConstraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInteractionConstraint_2113OutgoingLinks(View view) {

+		InteractionConstraint modelElement = (InteractionConstraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getConstraint_2114OutgoingLinks(View view) {

+		Constraint modelElement = (Constraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getPort_3069OutgoingLinks(View view) {

+		Port modelElement = (Port)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getParameter_3088OutgoingLinks(View view) {

+		Parameter modelElement = (Parameter)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getProperty_3070OutgoingLinks(View view) {

+		Property modelElement = (Property)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getConnectableElement_3115OutgoingLinks(View view) {

+		ConnectableElement modelElement = (ConnectableElement)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getCollaborationUse_3071OutgoingLinks(View view) {

+		CollaborationUse modelElement = (CollaborationUse)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getActivity_3072OutgoingLinks(View view) {

+		Activity modelElement = (Activity)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInteraction_3073OutgoingLinks(View view) {

+		Interaction modelElement = (Interaction)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getProtocolStateMachine_3074OutgoingLinks(View view) {

+		ProtocolStateMachine modelElement = (ProtocolStateMachine)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getStateMachine_3075OutgoingLinks(View view) {

+		StateMachine modelElement = (StateMachine)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getFunctionBehavior_3076OutgoingLinks(View view) {

+		FunctionBehavior modelElement = (FunctionBehavior)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getOpaqueBehavior_3077OutgoingLinks(View view) {

+		OpaqueBehavior modelElement = (OpaqueBehavior)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComponent_3081OutgoingLinks(View view) {

+		Component modelElement = (Component)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDevice_3082OutgoingLinks(View view) {

+		Device modelElement = (Device)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getExecutionEnvironment_3083OutgoingLinks(View view) {

+		ExecutionEnvironment modelElement = (ExecutionEnvironment)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getNode_3084OutgoingLinks(View view) {

+		Node modelElement = (Node)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getClass_3085OutgoingLinks(View view) {

+		Class modelElement = (Class)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getCollaboration_3086OutgoingLinks(View view) {

+		Collaboration modelElement = (Collaboration)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInterface_3087OutgoingLinks(View view) {

+		Interface modelElement = (Interface)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getPrimitiveType_3078OutgoingLinks(View view) {

+		PrimitiveType modelElement = (PrimitiveType)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getEnumeration_3079OutgoingLinks(View view) {

+		Enumeration modelElement = (Enumeration)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDataType_3080OutgoingLinks(View view) {

+		DataType modelElement = (DataType)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getActor_3091OutgoingLinks(View view) {

+		Actor modelElement = (Actor)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDeploymentSpecification_3092OutgoingLinks(View view) {

+		DeploymentSpecification modelElement = (DeploymentSpecification)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getArtifact_3093OutgoingLinks(View view) {

+		Artifact modelElement = (Artifact)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInformationItem_3094OutgoingLinks(View view) {

+		InformationItem modelElement = (InformationItem)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getSignal_3095OutgoingLinks(View view) {

+		Signal modelElement = (Signal)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getUseCase_3096OutgoingLinks(View view) {

+		UseCase modelElement = (UseCase)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Generalization_4015(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComment_3097OutgoingLinks(View view) {

+		Comment modelElement = (Comment)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDurationConstraint_3116OutgoingLinks(View view) {

+		DurationConstraint modelElement = (DurationConstraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getTimeConstraint_3117OutgoingLinks(View view) {

+		TimeConstraint modelElement = (TimeConstraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getIntervalConstraint_3118OutgoingLinks(View view) {

+		IntervalConstraint modelElement = (IntervalConstraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInteractionConstraint_3119OutgoingLinks(View view) {

+		InteractionConstraint modelElement = (InteractionConstraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getConstraint_3120OutgoingLinks(View view) {

+		Constraint modelElement = (Constraint)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getProperty_3101OutgoingLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getOperation_3102OutgoingLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getEnumerationLiteral_3066OutgoingLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getComponentRealization_4004OutgoingLinks(View view) {

+		ComponentRealization modelElement = (ComponentRealization)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInterfaceRealization_4005OutgoingLinks(View view) {

+		InterfaceRealization modelElement = (InterfaceRealization)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getSubstitution_4011OutgoingLinks(View view) {

+		Substitution modelElement = (Substitution)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getRealization_4006OutgoingLinks(View view) {

+		Realization modelElement = (Realization)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getManifestation_4012OutgoingLinks(View view) {

+		Manifestation modelElement = (Manifestation)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getAbstraction_4007OutgoingLinks(View view) {

+		Abstraction modelElement = (Abstraction)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getUsage_4008OutgoingLinks(View view) {

+		Usage modelElement = (Usage)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDeployment_4009OutgoingLinks(View view) {

+		Deployment modelElement = (Deployment)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDependency_4017OutgoingLinks(View view) {

+		Dependency modelElement = (Dependency)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getDependency_4010OutgoingLinks(View view) {

+		Dependency modelElement = (Dependency)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getConnector_4013OutgoingLinks(View view) {

+		Connector modelElement = (Connector)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getGeneralization_4015OutgoingLinks(View view) {

+		return Collections.emptyList();

+	}

+

+	/**

+	 * @generated

+	 */

+	public List<UMLLinkDescriptor> getInformationFlow_4021OutgoingLinks(View view) {

+		InformationFlow modelElement = (InformationFlow)view.getElement();

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		result.addAll(getOutgoingTypeModelFacetLinks_ComponentRealization_4004(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Substitution_4011(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Realization_4006(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Manifestation_4012(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Abstraction_4007(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Usage_4008(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Deployment_4009(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4017(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_Dependency_4010(modelElement));

+		result.addAll(getOutgoingTypeModelFacetLinks_InformationFlow_4021(modelElement));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_ComponentRealization_4004(Package container) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof ComponentRealization) {

+				continue;

+			}

+			ComponentRealization link = (ComponentRealization)linkObject;

+			if(ComponentRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if(false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement)theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.ComponentRealization_4004, ComponentRealizationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_InterfaceRealization_4005(Package container) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof InterfaceRealization) {

+				continue;

+			}

+			InterfaceRealization link = (InterfaceRealization)linkObject;

+			if(InterfaceRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if(false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement)theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InterfaceRealization_4005, InterfaceRealizationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Substitution_4011(Package container) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Substitution) {

+				continue;

+			}

+			Substitution link = (Substitution)linkObject;

+			if(SubstitutionEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if(false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement)theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Substitution_4011, SubstitutionEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Realization_4006(Package container) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Realization) {

+				continue;

+			}

+			Realization link = (Realization)linkObject;

+			if(RealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if(false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement)theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Realization_4006, RealizationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Manifestation_4012(Package container) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Manifestation) {

+				continue;

+			}

+			Manifestation link = (Manifestation)linkObject;

+			if(ManifestationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if(false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement)theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Manifestation_4012, ManifestationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Abstraction_4007(Package container) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Abstraction) {

+				continue;

+			}

+			Abstraction link = (Abstraction)linkObject;

+			if(AbstractionEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if(false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement)theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Abstraction_4007, AbstractionEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Usage_4008(Package container) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Usage) {

+				continue;

+			}

+			Usage link = (Usage)linkObject;

+			if(UsageEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if(false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement)theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Usage_4008, UsageEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Deployment_4009(Package container) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Deployment) {

+				continue;

+			}

+			Deployment link = (Deployment)linkObject;

+			if(DeploymentEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if(false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement)theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Deployment_4009, DeploymentEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Dependency_4017(Package container) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Dependency) {

+				continue;

+			}

+			Dependency link = (Dependency)linkObject;

+			if(RoleBindingEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if(false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement)theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_4017, RoleBindingEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Dependency_4010(Package container) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Dependency) {

+				continue;

+			}

+			Dependency link = (Dependency)linkObject;

+			if(DependencyEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if(false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement)theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_4010, DependencyEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Connector_4013(StructuredClassifier container) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> links = container.getOwnedConnectors().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Connector) {

+				continue;

+			}

+			Connector link = (Connector)linkObject;

+			if(ConnectorEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> targets = link.getEnds();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if(false == theTarget instanceof ConnectorEnd) {

+				continue;

+			}

+			ConnectorEnd dst = (ConnectorEnd)theTarget;

+			List<?> sources = link.getEnds();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof ConnectorEnd) {

+				continue;

+			}

+			ConnectorEnd src = (ConnectorEnd)theSource;

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Connector_4013, ConnectorEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_Generalization_4015(Classifier container) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> links = container.getGeneralizations().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Generalization) {

+				continue;

+			}

+			Generalization link = (Generalization)linkObject;

+			if(GeneralizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			Classifier dst = link.getGeneral();

+			Classifier src = link.getSpecific();

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Generalization_4015, GeneralizationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getContainedTypeModelFacetLinks_InformationFlow_4021(Package container) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof InformationFlow) {

+				continue;

+			}

+			InformationFlow link = (InformationFlow)linkObject;

+			if(InformationFlowEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> targets = link.getInformationTargets();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if(false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement)theTarget;

+			List<?> sources = link.getInformationSources();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InformationFlow_4021, InformationFlowEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(Element target, CrossReferenceAdapter crossReferencer) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getComment_AnnotatedElement()) {

+				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.CommentAnnotatedElement_4002, CommentAnnotatedElementEditPart.VISUAL_ID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(Element target, CrossReferenceAdapter crossReferencer) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getConstraint_ConstrainedElement()) {

+				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.ConstraintConstrainedElement_4003, ConstraintConstrainedElementEditPart.VISUAL_ID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_ComponentRealization_4004(NamedElement target, CrossReferenceAdapter crossReferencer) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof ComponentRealization) {

+				continue;

+			}

+			ComponentRealization link = (ComponentRealization)setting.getEObject();

+			if(ComponentRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.ComponentRealization_4004, ComponentRealizationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_InterfaceRealization_4005(NamedElement target, CrossReferenceAdapter crossReferencer) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof InterfaceRealization) {

+				continue;

+			}

+			InterfaceRealization link = (InterfaceRealization)setting.getEObject();

+			if(InterfaceRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.InterfaceRealization_4005, InterfaceRealizationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Substitution_4011(NamedElement target, CrossReferenceAdapter crossReferencer) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Substitution) {

+				continue;

+			}

+			Substitution link = (Substitution)setting.getEObject();

+			if(SubstitutionEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Substitution_4011, SubstitutionEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Realization_4006(NamedElement target, CrossReferenceAdapter crossReferencer) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Realization) {

+				continue;

+			}

+			Realization link = (Realization)setting.getEObject();

+			if(RealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Realization_4006, RealizationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Manifestation_4012(NamedElement target, CrossReferenceAdapter crossReferencer) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Manifestation) {

+				continue;

+			}

+			Manifestation link = (Manifestation)setting.getEObject();

+			if(ManifestationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Manifestation_4012, ManifestationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Abstraction_4007(NamedElement target, CrossReferenceAdapter crossReferencer) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Abstraction) {

+				continue;

+			}

+			Abstraction link = (Abstraction)setting.getEObject();

+			if(AbstractionEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Abstraction_4007, AbstractionEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Usage_4008(NamedElement target, CrossReferenceAdapter crossReferencer) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Usage) {

+				continue;

+			}

+			Usage link = (Usage)setting.getEObject();

+			if(UsageEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Usage_4008, UsageEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Deployment_4009(NamedElement target, CrossReferenceAdapter crossReferencer) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Deployment) {

+				continue;

+			}

+			Deployment link = (Deployment)setting.getEObject();

+			if(DeploymentEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Deployment_4009, DeploymentEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Dependency_4017(NamedElement target, CrossReferenceAdapter crossReferencer) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Dependency) {

+				continue;

+			}

+			Dependency link = (Dependency)setting.getEObject();

+			if(RoleBindingEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_4017, RoleBindingEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Dependency_4010(NamedElement target, CrossReferenceAdapter crossReferencer) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getDependency_Supplier() || false == setting.getEObject() instanceof Dependency) {

+				continue;

+			}

+			Dependency link = (Dependency)setting.getEObject();

+			if(DependencyEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Dependency_4010, DependencyEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_Generalization_4015(Classifier target, CrossReferenceAdapter crossReferencer) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getGeneralization_General() || false == setting.getEObject() instanceof Generalization) {

+				continue;

+			}

+			Generalization link = (Generalization)setting.getEObject();

+			if(GeneralizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			Classifier src = link.getSpecific();

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.Generalization_4015, GeneralizationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_TimeObservation_Event_4018(NamedElement target, CrossReferenceAdapter crossReferencer) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getTimeObservation_Event()) {

+				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.TimeObservationEvent_4018, TimeObservationEventEditPart.VISUAL_ID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_DurationObservation_Event_4019(NamedElement target, CrossReferenceAdapter crossReferencer) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getDurationObservation_Event()) {

+				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.DurationObservationEvent_4019, DurationObservationEventEditPart.VISUAL_ID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingFeatureModelFacetLinks_InformationItem_Represented_4020(Classifier target, CrossReferenceAdapter crossReferencer) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() == UMLPackage.eINSTANCE.getInformationItem_Represented()) {

+				result.add(new UMLLinkDescriptor(setting.getEObject(), target, UMLElementTypes.InformationItemRepresented_4020, RepresentationEditPart.VISUAL_ID));

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getIncomingTypeModelFacetLinks_InformationFlow_4021(NamedElement target, CrossReferenceAdapter crossReferencer) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		Collection<EStructuralFeature.Setting> settings = crossReferencer.getInverseReferences(target);

+		for(EStructuralFeature.Setting setting : settings) {

+			if(setting.getEStructuralFeature() != UMLPackage.eINSTANCE.getInformationFlow_InformationTarget() || false == setting.getEObject() instanceof InformationFlow) {

+				continue;

+			}

+			InformationFlow link = (InformationFlow)setting.getEObject();

+			if(InformationFlowEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> sources = link.getInformationSources();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			result.add(new UMLLinkDescriptor(src, target, link, UMLElementTypes.InformationFlow_4021, InformationFlowEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Comment_AnnotatedElement_4002(Comment source) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> destinations = source.getAnnotatedElements().iterator(); destinations.hasNext();) {

+			Element destination = (Element)destinations.next();

+			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.CommentAnnotatedElement_4002, CommentAnnotatedElementEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_Constraint_ConstrainedElement_4003(Constraint source) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> destinations = source.getConstrainedElements().iterator(); destinations.hasNext();) {

+			Element destination = (Element)destinations.next();

+			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.ConstraintConstrainedElement_4003, ConstraintConstrainedElementEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_ComponentRealization_4004(NamedElement source) {

+		Package container = null;

+		// Find container element for the link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				container = (Package)element;

+			}

+		}

+		if(container == null) {

+			return Collections.emptyList();

+		}

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof ComponentRealization) {

+				continue;

+			}

+			ComponentRealization link = (ComponentRealization)linkObject;

+			if(ComponentRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if(false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement)theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			if(src != source) {

+				continue;

+			}

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.ComponentRealization_4004, ComponentRealizationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_InterfaceRealization_4005(NamedElement source) {

+		Package container = null;

+		// Find container element for the link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				container = (Package)element;

+			}

+		}

+		if(container == null) {

+			return Collections.emptyList();

+		}

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof InterfaceRealization) {

+				continue;

+			}

+			InterfaceRealization link = (InterfaceRealization)linkObject;

+			if(InterfaceRealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if(false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement)theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			if(src != source) {

+				continue;

+			}

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InterfaceRealization_4005, InterfaceRealizationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Substitution_4011(NamedElement source) {

+		Package container = null;

+		// Find container element for the link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				container = (Package)element;

+			}

+		}

+		if(container == null) {

+			return Collections.emptyList();

+		}

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Substitution) {

+				continue;

+			}

+			Substitution link = (Substitution)linkObject;

+			if(SubstitutionEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if(false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement)theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			if(src != source) {

+				continue;

+			}

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Substitution_4011, SubstitutionEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Realization_4006(NamedElement source) {

+		Package container = null;

+		// Find container element for the link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				container = (Package)element;

+			}

+		}

+		if(container == null) {

+			return Collections.emptyList();

+		}

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Realization) {

+				continue;

+			}

+			Realization link = (Realization)linkObject;

+			if(RealizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if(false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement)theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			if(src != source) {

+				continue;

+			}

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Realization_4006, RealizationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Manifestation_4012(NamedElement source) {

+		Package container = null;

+		// Find container element for the link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				container = (Package)element;

+			}

+		}

+		if(container == null) {

+			return Collections.emptyList();

+		}

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Manifestation) {

+				continue;

+			}

+			Manifestation link = (Manifestation)linkObject;

+			if(ManifestationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if(false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement)theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			if(src != source) {

+				continue;

+			}

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Manifestation_4012, ManifestationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Abstraction_4007(NamedElement source) {

+		Package container = null;

+		// Find container element for the link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				container = (Package)element;

+			}

+		}

+		if(container == null) {

+			return Collections.emptyList();

+		}

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Abstraction) {

+				continue;

+			}

+			Abstraction link = (Abstraction)linkObject;

+			if(AbstractionEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if(false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement)theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			if(src != source) {

+				continue;

+			}

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Abstraction_4007, AbstractionEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Usage_4008(NamedElement source) {

+		Package container = null;

+		// Find container element for the link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				container = (Package)element;

+			}

+		}

+		if(container == null) {

+			return Collections.emptyList();

+		}

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Usage) {

+				continue;

+			}

+			Usage link = (Usage)linkObject;

+			if(UsageEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if(false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement)theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			if(src != source) {

+				continue;

+			}

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Usage_4008, UsageEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Deployment_4009(NamedElement source) {

+		Package container = null;

+		// Find container element for the link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				container = (Package)element;

+			}

+		}

+		if(container == null) {

+			return Collections.emptyList();

+		}

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Deployment) {

+				continue;

+			}

+			Deployment link = (Deployment)linkObject;

+			if(DeploymentEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if(false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement)theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			if(src != source) {

+				continue;

+			}

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Deployment_4009, DeploymentEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Dependency_4017(NamedElement source) {

+		Package container = null;

+		// Find container element for the link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				container = (Package)element;

+			}

+		}

+		if(container == null) {

+			return Collections.emptyList();

+		}

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Dependency) {

+				continue;

+			}

+			Dependency link = (Dependency)linkObject;

+			if(RoleBindingEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if(false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement)theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			if(src != source) {

+				continue;

+			}

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_4017, RoleBindingEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Dependency_4010(NamedElement source) {

+		Package container = null;

+		// Find container element for the link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				container = (Package)element;

+			}

+		}

+		if(container == null) {

+			return Collections.emptyList();

+		}

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Dependency) {

+				continue;

+			}

+			Dependency link = (Dependency)linkObject;

+			if(DependencyEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> targets = link.getSuppliers();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if(false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement)theTarget;

+			List<?> sources = link.getClients();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			if(src != source) {

+				continue;

+			}

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Dependency_4010, DependencyEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_Generalization_4015(Classifier source) {

+		Classifier container = null;

+		// Find container element for the link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if(element instanceof Classifier) {

+				container = (Classifier)element;

+			}

+		}

+		if(container == null) {

+			return Collections.emptyList();

+		}

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> links = container.getGeneralizations().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof Generalization) {

+				continue;

+			}

+			Generalization link = (Generalization)linkObject;

+			if(GeneralizationEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			Classifier dst = link.getGeneral();

+			Classifier src = link.getSpecific();

+			if(src != source) {

+				continue;

+			}

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.Generalization_4015, GeneralizationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_TimeObservation_Event_4018(TimeObservation source) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		NamedElement destination = source.getEvent();

+		if(destination == null) {

+			return result;

+		}

+		result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.TimeObservationEvent_4018, TimeObservationEventEditPart.VISUAL_ID));

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_DurationObservation_Event_4019(DurationObservation source) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> destinations = source.getEvents().iterator(); destinations.hasNext();) {

+			NamedElement destination = (NamedElement)destinations.next();

+			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.DurationObservationEvent_4019, DurationObservationEventEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingFeatureModelFacetLinks_InformationItem_Represented_4020(InformationItem source) {

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> destinations = source.getRepresenteds().iterator(); destinations.hasNext();) {

+			Classifier destination = (Classifier)destinations.next();

+			result.add(new UMLLinkDescriptor(source, destination, UMLElementTypes.InformationItemRepresented_4020, RepresentationEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Collection<UMLLinkDescriptor> getOutgoingTypeModelFacetLinks_InformationFlow_4021(NamedElement source) {

+		Package container = null;

+		// Find container element for the link.

+		// Climb up by containment hierarchy starting from the source

+		// and return the first element that is instance of the container class.

+		for(EObject element = source; element != null && container == null; element = element.eContainer()) {

+			if(element instanceof Package) {

+				container = (Package)element;

+			}

+		}

+		if(container == null) {

+			return Collections.emptyList();

+		}

+		LinkedList<UMLLinkDescriptor> result = new LinkedList<UMLLinkDescriptor>();

+		for(Iterator<?> links = container.getPackagedElements().iterator(); links.hasNext();) {

+			EObject linkObject = (EObject)links.next();

+			if(false == linkObject instanceof InformationFlow) {

+				continue;

+			}

+			InformationFlow link = (InformationFlow)linkObject;

+			if(InformationFlowEditPart.VISUAL_ID != UMLVisualIDRegistry.getLinkWithClassVisualID(link)) {

+				continue;

+			}

+			List<?> targets = link.getInformationTargets();

+			Object theTarget = targets.size() == 1 ? targets.get(0) : null;

+			if(false == theTarget instanceof NamedElement) {

+				continue;

+			}

+			NamedElement dst = (NamedElement)theTarget;

+			List<?> sources = link.getInformationSources();

+			Object theSource = sources.size() == 1 ? sources.get(0) : null;

+			if(false == theSource instanceof NamedElement) {

+				continue;

+			}

+			NamedElement src = (NamedElement)theSource;

+			if(src != source) {

+				continue;

+			}

+			result.add(new UMLLinkDescriptor(src, dst, link, UMLElementTypes.InformationFlow_4021, InformationFlowEditPart.VISUAL_ID));

+		}

+		return result;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDocumentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDocumentProvider.java
index f258f44b507..f61555e0244 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDocumentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDocumentProvider.java
@@ -1,976 +1,984 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.part;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.MultiRule;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.ui.URIEditorInput;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EContentAdapter;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.transaction.NotificationFilter;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.core.DiagramEditingDomainFactory;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.AbstractDocumentProvider;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.DiagramDocument;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocumentProvider;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorStatusCodes;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.util.DiagramIOUtil;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.part.FileEditorInput;
-
-/**
- * @generated
- */
-public class UMLDocumentProvider extends AbstractDocumentProvider implements IDiagramDocumentProvider {
-	/**
-	 * @generated
-	 */
-	protected ElementInfo createElementInfo(Object element) throws CoreException {
-		if (false == element instanceof FileEditorInput && false == element instanceof URIEditorInput) {
-			throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0,
-					NLS.bind(
-							Messages.UMLDocumentProvider_IncorrectInputError,
-							new Object[] { element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ 
-					null));
-		}
-		IEditorInput editorInput = (IEditorInput) element;
-		IDiagramDocument document = (IDiagramDocument) createDocument(editorInput);
-		ResourceSetInfo info = new ResourceSetInfo(document, editorInput);
-		info.setModificationStamp(computeModificationStamp(info));
-		info.fStatus = null;
-		return info;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IDocument createDocument(Object element) throws CoreException {
-		if (false == element instanceof FileEditorInput && false == element instanceof URIEditorInput) {
-			throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0,
-					NLS.bind(
-							Messages.UMLDocumentProvider_IncorrectInputError,
-							new Object[] { element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ 
-					null));
-		}
-		IDocument document = createEmptyDocument();
-		setDocumentContent(document, (IEditorInput) element);
-		setupDocument(element, document);
-		return document;
-	}
-
-	/**
-	 * Sets up the given document as it would be provided for the given element. The
-	 * content of the document is not changed. This default implementation is empty.
-	 * Subclasses may reimplement.
-	 * 
-	 * @param element the blue-print element
-	 * @param document the document to set up
-	 * @generated
-	 */
-	protected void setupDocument(Object element, IDocument document) {
-		// for subclasses
-	}
-
-	/**
-	 * @generated
-	 */
-	private long computeModificationStamp(ResourceSetInfo info) {
-		int result = 0;
-		for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {
-			Resource nextResource = it.next();
-			IFile file = WorkspaceSynchronizer.getFile(nextResource);
-			if (file != null) {
-				if (file.getLocation() != null) {
-					result += file.getLocation().toFile().lastModified();
-				} else {
-					result += file.getModificationStamp();
-				}
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IDocument createEmptyDocument() {
-		DiagramDocument document = new DiagramDocument();
-		document.setEditingDomain(createEditingDomain());
-		return document;
-	}
-
-	/**
-	 * @generated
-	 */
-	private TransactionalEditingDomain createEditingDomain() {
-		TransactionalEditingDomain editingDomain = DiagramEditingDomainFactory.getInstance().createEditingDomain();
-		editingDomain.setID("org.eclipse.papyrus.uml.diagram.composite.EditingDomain"); //$NON-NLS-1$
-		final NotificationFilter diagramResourceModifiedFilter = NotificationFilter.createNotifierFilter(editingDomain.getResourceSet()).and(NotificationFilter.createEventTypeFilter(Notification.ADD))
-				.and(NotificationFilter.createFeatureFilter(ResourceSet.class, ResourceSet.RESOURCE_SET__RESOURCES));
-		editingDomain.getResourceSet().eAdapters().add(new Adapter() {
-			private Notifier myTarger;
-
-			public Notifier getTarget() {
-				return myTarger;
-			}
-
-			public boolean isAdapterForType(Object type) {
-				return false;
-			}
-
-			public void notifyChanged(Notification notification) {
-				if (diagramResourceModifiedFilter.matches(notification)) {
-					Object value = notification.getNewValue();
-					if (value instanceof Resource) {
-						((Resource) value).setTrackingModification(true);
-					}
-				}
-			}
-
-			public void setTarget(Notifier newTarget) {
-				myTarger = newTarget;
-			}
-		});
-		return editingDomain;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void setDocumentContent(IDocument document, IEditorInput element) throws CoreException {
-		IDiagramDocument diagramDocument = (IDiagramDocument) document;
-		TransactionalEditingDomain domain = diagramDocument.getEditingDomain();
-		if (element instanceof FileEditorInput) {
-			IStorage storage = ((FileEditorInput) element).getStorage();
-			Diagram diagram = DiagramIOUtil.load(domain, storage, true, getProgressMonitor());
-			document.setContent(diagram);
-		} else if (element instanceof URIEditorInput) {
-			URI uri = ((URIEditorInput) element).getURI();
-			Resource resource = null;
-			try {
-				resource = domain.getResourceSet().getResource(uri.trimFragment(), false);
-				if (resource == null) {
-					resource = domain.getResourceSet().createResource(uri.trimFragment());
-				}
-				if (!resource.isLoaded()) {
-					try {
-						@SuppressWarnings({ "rawtypes", "unchecked" })
-						Map<?, ?> options = new HashMap(GMFResourceFactory.getDefaultLoadOptions());
-						// @see 171060 
-						// options.put(org.eclipse.emf.ecore.xmi.XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, Boolean.TRUE);
-						resource.load(options);
-					} catch (IOException e) {
-						resource.unload();
-						throw e;
-					}
-				}
-				if (uri.fragment() != null) {
-					EObject rootElement = resource.getEObject(uri.fragment());
-					if (rootElement instanceof Diagram) {
-						document.setContent((Diagram) rootElement);
-						return;
-					}
-				} else {
-					for (Iterator<EObject> it = resource.getContents().iterator(); it.hasNext();) {
-						Object rootElement = it.next();
-						if (rootElement instanceof Diagram) {
-							document.setContent((Diagram) rootElement);
-							return;
-						}
-					}
-				}
-				throw new RuntimeException(Messages.UMLDocumentProvider_NoDiagramInResourceError);
-			} catch (Exception e) {
-				CoreException thrownExcp = null;
-				if (e instanceof CoreException) {
-					thrownExcp = (CoreException) e;
-				} else {
-					String msg = e.getLocalizedMessage();
-					thrownExcp = new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0,
-							msg != null ? msg : Messages.UMLDocumentProvider_DiagramLoadingError, e));
-				}
-				throw thrownExcp;
-			}
-		} else {
-			throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0,
-					NLS.bind(
-							Messages.UMLDocumentProvider_IncorrectInputError,
-							new Object[] { element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ 
-					null));
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public long getModificationStamp(Object element) {
-		ResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			return computeModificationStamp(info);
-		}
-		return super.getModificationStamp(element);
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean isDeleted(Object element) {
-		IDiagramDocument document = getDiagramDocument(element);
-		if (document != null) {
-			Resource diagramResource = document.getDiagram().eResource();
-			if (diagramResource != null) {
-				IFile file = WorkspaceSynchronizer.getFile(diagramResource);
-				return file == null || file.getLocation() == null || !file.getLocation().toFile().exists();
-			}
-		}
-		return super.isDeleted(element);
-	}
-
-	/**
-	 * @generated
-	 */
-	public ResourceSetInfo getResourceSetInfo(Object editorInput) {
-		return (ResourceSetInfo) super.getElementInfo(editorInput);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void disposeElementInfo(Object element, ElementInfo info) {
-		if (info instanceof ResourceSetInfo) {
-			ResourceSetInfo resourceSetInfo = (ResourceSetInfo) info;
-			resourceSetInfo.dispose();
-		}
-		super.disposeElementInfo(element, info);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doValidateState(Object element, Object computationContext) throws CoreException {
-		ResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			LinkedList<IFile> files2Validate = new LinkedList<IFile>();
-			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {
-				Resource nextResource = it.next();
-				IFile file = WorkspaceSynchronizer.getFile(nextResource);
-				if (file != null && file.isReadOnly()) {
-					files2Validate.add(file);
-				}
-			}
-			ResourcesPlugin.getWorkspace().validateEdit((IFile[]) files2Validate.toArray(new IFile[files2Validate.size()]), computationContext);
-		}
-		super.doValidateState(element, computationContext);
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean isReadOnly(Object element) {
-		ResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			if (info.isUpdateCache()) {
-				try {
-					updateCache(element);
-				} catch (CoreException ex) {
-					UMLDiagramEditorPlugin.getInstance().logError(Messages.UMLDocumentProvider_isModifiable, ex);
-					// Error message to log was initially taken from org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.StorageDocumentProvider_isModifiable
-				}
-			}
-			return info.isReadOnly();
-		}
-		return super.isReadOnly(element);
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean isModifiable(Object element) {
-		if (!isStateValidated(element)) {
-			if (element instanceof FileEditorInput || element instanceof URIEditorInput) {
-				return true;
-			}
-		}
-		ResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			if (info.isUpdateCache()) {
-				try {
-					updateCache(element);
-				} catch (CoreException ex) {
-					UMLDiagramEditorPlugin.getInstance().logError(Messages.UMLDocumentProvider_isModifiable, ex);
-					// Error message to log was initially taken from org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.StorageDocumentProvider_isModifiable
-				}
-			}
-			return info.isModifiable();
-		}
-		return super.isModifiable(element);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void updateCache(Object element) throws CoreException {
-		ResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {
-				Resource nextResource = it.next();
-				IFile file = WorkspaceSynchronizer.getFile(nextResource);
-				if (file != null && file.isReadOnly()) {
-					info.setReadOnly(true);
-					info.setModifiable(false);
-					return;
-				}
-			}
-			info.setReadOnly(false);
-			info.setModifiable(true);
-			return;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doUpdateStateCache(Object element) throws CoreException {
-		ResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			info.setUpdateCache(true);
-		}
-		super.doUpdateStateCache(element);
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean isSynchronized(Object element) {
-		ResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			return info.isSynchronized();
-		}
-		return super.isSynchronized(element);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected ISchedulingRule getResetRule(Object element) {
-		ResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			LinkedList<ISchedulingRule> rules = new LinkedList<ISchedulingRule>();
-			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {
-				Resource nextResource = it.next();
-				IFile file = WorkspaceSynchronizer.getFile(nextResource);
-				if (file != null) {
-					rules.add(ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(file));
-				}
-			}
-			return new MultiRule((ISchedulingRule[]) rules.toArray(new ISchedulingRule[rules.size()]));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected ISchedulingRule getSaveRule(Object element) {
-		ResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			LinkedList<ISchedulingRule> rules = new LinkedList<ISchedulingRule>();
-			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {
-				Resource nextResource = it.next();
-				IFile file = WorkspaceSynchronizer.getFile(nextResource);
-				if (file != null) {
-					rules.add(computeSchedulingRule(file));
-				}
-			}
-			return new MultiRule((ISchedulingRule[]) rules.toArray(new ISchedulingRule[rules.size()]));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected ISchedulingRule getSynchronizeRule(Object element) {
-		ResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			LinkedList<ISchedulingRule> rules = new LinkedList<ISchedulingRule>();
-			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {
-				Resource nextResource = it.next();
-				IFile file = WorkspaceSynchronizer.getFile(nextResource);
-				if (file != null) {
-					rules.add(ResourcesPlugin.getWorkspace().getRuleFactory().refreshRule(file));
-				}
-			}
-			return new MultiRule((ISchedulingRule[]) rules.toArray(new ISchedulingRule[rules.size()]));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected ISchedulingRule getValidateStateRule(Object element) {
-		ResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			LinkedList<ISchedulingRule> files = new LinkedList<ISchedulingRule>();
-			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {
-				Resource nextResource = it.next();
-				IFile file = WorkspaceSynchronizer.getFile(nextResource);
-				if (file != null) {
-					files.add(file);
-				}
-			}
-			return ResourcesPlugin.getWorkspace().getRuleFactory().validateEditRule((IFile[]) files.toArray(new IFile[files.size()]));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ISchedulingRule computeSchedulingRule(IResource toCreateOrModify) {
-		if (toCreateOrModify.exists())
-			return ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(toCreateOrModify);
-		IResource parent = toCreateOrModify;
-		do {
-			/*
-			 * XXX This is a workaround for
-			 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=67601
-			 * IResourceRuleFactory.createRule should iterate the hierarchy
-			 * itself.
-			 */
-			toCreateOrModify = parent;
-			parent = toCreateOrModify.getParent();
-		} while (parent != null && !parent.exists());
-		return ResourcesPlugin.getWorkspace().getRuleFactory().createRule(toCreateOrModify);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doSynchronize(Object element, IProgressMonitor monitor) throws CoreException {
-		ResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {
-				Resource nextResource = it.next();
-				handleElementChanged(info, nextResource, monitor);
-			}
-			return;
-		}
-		super.doSynchronize(element, monitor);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite) throws CoreException {
-		ResourceSetInfo info = getResourceSetInfo(element);
-		if (info != null) {
-			if (!overwrite && !info.isSynchronized()) {
-				throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID,
-						IResourceStatus.OUT_OF_SYNC_LOCAL,
-						Messages.UMLDocumentProvider_UnsynchronizedFileSaveError,
-						null));
-			}
-			info.stopResourceListening();
-			fireElementStateChanging(element);
-			try {
-				monitor.beginTask(Messages.UMLDocumentProvider_SaveDiagramTask, info.getResourceSet().getResources().size() + 1); //"Saving diagram"
-				for (Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {
-					Resource nextResource = it.next();
-					monitor.setTaskName(NLS.bind(
-							Messages.UMLDocumentProvider_SaveNextResourceTask,
-							nextResource.getURI()));
-					if (nextResource.isLoaded() && !info.getEditingDomain().isReadOnly(nextResource)) {
-						try {
-							nextResource.save(UMLDiagramEditorUtil.getSaveOptions());
-						} catch (IOException e) {
-							fireElementStateChangeFailed(element);
-							throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, EditorStatusCodes.RESOURCE_FAILURE, e.getLocalizedMessage(), null));
-						}
-					}
-					monitor.worked(1);
-				}
-				monitor.done();
-				info.setModificationStamp(computeModificationStamp(info));
-			} catch (RuntimeException x) {
-				fireElementStateChangeFailed(element);
-				throw x;
-			} finally {
-				info.startResourceListening();
-			}
-		} else {
-			URI newResoruceURI;
-			List<IFile> affectedFiles = null;
-			if (element instanceof FileEditorInput) {
-				IFile newFile = ((FileEditorInput) element).getFile();
-				affectedFiles = Collections.singletonList(newFile);
-				newResoruceURI = URI.createPlatformResourceURI(newFile.getFullPath().toString(), true);
-			} else if (element instanceof URIEditorInput) {
-				newResoruceURI = ((URIEditorInput) element).getURI();
-			} else {
-				fireElementStateChangeFailed(element);
-				throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0,
-						NLS.bind(
-								Messages.UMLDocumentProvider_IncorrectInputError,
-								new Object[] { element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ 
-						null));
-			}
-			if (false == document instanceof IDiagramDocument) {
-				fireElementStateChangeFailed(element);
-				throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0,
-						"Incorrect document used: " + document + " instead of org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument", null)); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			IDiagramDocument diagramDocument = (IDiagramDocument) document;
-			final Resource newResource = diagramDocument.getEditingDomain().getResourceSet().createResource(newResoruceURI);
-			final Diagram diagramCopy = (Diagram) EcoreUtil.copy(diagramDocument.getDiagram());
-			try {
-				new AbstractTransactionalCommand(diagramDocument.getEditingDomain(), NLS.bind(Messages.UMLDocumentProvider_SaveAsOperation, diagramCopy.getName()), affectedFiles) {
-					protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-						newResource.getContents().add(diagramCopy);
-						return CommandResult.newOKCommandResult();
-					}
-				}.execute(monitor, null);
-				newResource.save(UMLDiagramEditorUtil.getSaveOptions());
-			} catch (ExecutionException e) {
-				fireElementStateChangeFailed(element);
-				throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, e.getLocalizedMessage(), null));
-			} catch (IOException e) {
-				fireElementStateChangeFailed(element);
-				throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, e.getLocalizedMessage(), null));
-			}
-			newResource.unload();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleElementChanged(ResourceSetInfo info, Resource changedResource, IProgressMonitor monitor) {
-		IFile file = WorkspaceSynchronizer.getFile(changedResource);
-		if (file != null) {
-			try {
-				file.refreshLocal(IResource.DEPTH_INFINITE, monitor);
-			} catch (CoreException ex) {
-				UMLDiagramEditorPlugin.getInstance().logError(Messages.UMLDocumentProvider_handleElementContentChanged, ex);
-				// Error message to log was initially taken from org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.FileDocumentProvider_handleElementContentChanged
-			}
-		}
-		changedResource.unload();
-		fireElementContentAboutToBeReplaced(info.getEditorInput());
-		removeUnchangedElementListeners(info.getEditorInput(), info);
-		info.fStatus = null;
-		try {
-			setDocumentContent(info.fDocument, info.getEditorInput());
-		} catch (CoreException e) {
-			info.fStatus = e.getStatus();
-		}
-		if (!info.fCanBeSaved) {
-			info.setModificationStamp(computeModificationStamp(info));
-		}
-		addUnchangedElementListeners(info.getEditorInput(), info);
-		fireElementContentReplaced(info.getEditorInput());
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void handleElementMoved(IEditorInput input, URI uri) {
-		if (input instanceof FileEditorInput) {
-			IFile newFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(URI.decode(uri.path())).removeFirstSegments(1));
-			fireElementMoved(input, newFile == null ? null : new FileEditorInput(newFile));
-			return;
-		}
-		// TODO: append suffix to the URI! (use diagram as a parameter)
-		fireElementMoved(input, new URIEditorInput(uri));
-	}
-
-	/**
-	 * @generated
-	 */
-	public IEditorInput createInputWithEditingDomain(IEditorInput editorInput, TransactionalEditingDomain domain) {
-		return editorInput;
-	}
-
-	/**
-	 * @generated
-	 */
-	public IDiagramDocument getDiagramDocument(Object element) {
-		IDocument doc = getDocument(element);
-		if (doc instanceof IDiagramDocument) {
-			return (IDiagramDocument) doc;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IRunnableContext getOperationRunner(IProgressMonitor monitor) {
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected class ResourceSetInfo extends ElementInfo {
-		/**
-		 * @generated
-		 */
-		private long myModificationStamp = IResource.NULL_STAMP;
-		/**
-		 * @generated
-		 */
-		private WorkspaceSynchronizer mySynchronizer;
-		/**
-		 * @generated
-		 */
-		private LinkedList<Resource> myUnSynchronizedResources = new LinkedList<Resource>();
-		/**
-		 * @generated
-		 */
-		private IDiagramDocument myDocument;
-		/**
-		 * @generated
-		 */
-		private IEditorInput myEditorInput;
-		/**
-		 * @generated
-		 */
-		private boolean myUpdateCache = true;
-		/**
-		 * @generated
-		 */
-		private boolean myModifiable = false;
-		/**
-		 * @generated
-		 */
-		private boolean myReadOnly = true;
-		/**
-		 * @generated
-		 */
-		private ResourceSetModificationListener myResourceSetListener;
-
-		/**
-		 * @generated
-		 */
-		public ResourceSetInfo(IDiagramDocument document, IEditorInput editorInput) {
-			super(document);
-			myDocument = document;
-			myEditorInput = editorInput;
-			startResourceListening();
-			myResourceSetListener = new ResourceSetModificationListener(this);
-			getResourceSet().eAdapters().add(myResourceSetListener);
-		}
-
-		/**
-		 * @generated
-		 */
-		public long getModificationStamp() {
-			return myModificationStamp;
-		}
-
-		/**
-		 * @generated
-		 */
-		public void setModificationStamp(long modificationStamp) {
-			myModificationStamp = modificationStamp;
-		}
-
-		/**
-		 * @generated
-		 */
-		public TransactionalEditingDomain getEditingDomain() {
-			return myDocument.getEditingDomain();
-		}
-
-		/**
-		 * @generated
-		 */
-		public ResourceSet getResourceSet() {
-			return getEditingDomain().getResourceSet();
-		}
-
-		/**
-		 * @generated
-		 */
-		public Iterator<Resource> getLoadedResourcesIterator() {
-			return new ArrayList<Resource>(getResourceSet().getResources()).iterator();
-		}
-
-		/**
-		 * @generated
-		 */
-		public IEditorInput getEditorInput() {
-			return myEditorInput;
-		}
-
-		/**
-		 * @generated
-		 */
-		public void dispose() {
-			stopResourceListening();
-			getResourceSet().eAdapters().remove(myResourceSetListener);
-			for (Iterator<Resource> it = getLoadedResourcesIterator(); it.hasNext();) {
-				Resource resource = it.next();
-				resource.unload();
-			}
-			getEditingDomain().dispose();
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean isSynchronized() {
-			return myUnSynchronizedResources.size() == 0;
-		}
-
-		/**
-		 * @generated
-		 */
-		public void setUnSynchronized(Resource resource) {
-			myUnSynchronizedResources.add(resource);
-		}
-
-		/**
-		 * @generated
-		 */
-		public void setSynchronized(Resource resource) {
-			myUnSynchronizedResources.remove(resource);
-		}
-
-		/**
-		 * @generated
-		 */
-		public final void stopResourceListening() {
-			mySynchronizer.dispose();
-			mySynchronizer = null;
-		}
-
-		/**
-		 * @generated
-		 */
-		public final void startResourceListening() {
-			mySynchronizer = new WorkspaceSynchronizer(getEditingDomain(), new SynchronizerDelegate());
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean isUpdateCache() {
-			return myUpdateCache;
-		}
-
-		/**
-		 * @generated
-		 */
-		public void setUpdateCache(boolean update) {
-			myUpdateCache = update;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean isModifiable() {
-			return myModifiable;
-		}
-
-		/**
-		 * @generated
-		 */
-		public void setModifiable(boolean modifiable) {
-			myModifiable = modifiable;
-		}
-
-		/**
-		 * @generated
-		 */
-		public boolean isReadOnly() {
-			return myReadOnly;
-		}
-
-		/**
-		 * @generated
-		 */
-		public void setReadOnly(boolean readOnly) {
-			myReadOnly = readOnly;
-		}
-
-		/**
-		 * @generated
-		 */
-		private class SynchronizerDelegate implements WorkspaceSynchronizer.Delegate {
-			/**
-			 * @generated
-			 */
-			public void dispose() {
-			}
-
-			/**
-			 * @generated
-			 */
-			public boolean handleResourceChanged(final Resource resource) {
-				synchronized (ResourceSetInfo.this) {
-					if (ResourceSetInfo.this.fCanBeSaved) {
-						ResourceSetInfo.this.setUnSynchronized(resource);
-						return true;
-					}
-				}
-				Display.getDefault().asyncExec(new Runnable() {
-					public void run() {
-						handleElementChanged(ResourceSetInfo.this, resource, null);
-					}
-				});
-				return true;
-			}
-
-			/**
-			 * @generated
-			 */
-			public boolean handleResourceDeleted(Resource resource) {
-				synchronized (ResourceSetInfo.this) {
-					if (ResourceSetInfo.this.fCanBeSaved) {
-						ResourceSetInfo.this.setUnSynchronized(resource);
-						return true;
-					}
-				}
-				Display.getDefault().asyncExec(new Runnable() {
-					public void run() {
-						fireElementDeleted(ResourceSetInfo.this.getEditorInput());
-					}
-				});
-				return true;
-			}
-
-			/**
-			 * @generated
-			 */
-			public boolean handleResourceMoved(Resource resource, final URI newURI) {
-				synchronized (ResourceSetInfo.this) {
-					if (ResourceSetInfo.this.fCanBeSaved) {
-						ResourceSetInfo.this.setUnSynchronized(resource);
-						return true;
-					}
-				}
-				if (myDocument.getDiagram().eResource() == resource) {
-					Display.getDefault().asyncExec(new Runnable() {
-						public void run() {
-							handleElementMoved(ResourceSetInfo.this.getEditorInput(), newURI);
-						}
-					});
-				} else {
-					handleResourceDeleted(resource);
-				}
-				return true;
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private class ResourceSetModificationListener extends EContentAdapter {
-		/**
-		 * @generated
-		 */
-		private NotificationFilter myModifiedFilter;
-		/**
-		 * @generated
-		 */
-		private ResourceSetInfo myInfo;
-
-		/**
-		 * @generated
-		 */
-		public ResourceSetModificationListener(ResourceSetInfo info) {
-			myInfo = info;
-			myModifiedFilter = NotificationFilter.createEventTypeFilter(Notification.SET).or(NotificationFilter.createEventTypeFilter(Notification.UNSET)).and(NotificationFilter.createFeatureFilter(Resource.class, Resource.RESOURCE__IS_MODIFIED));
-		}
-
-		/**
-		 * @generated
-		 */
-		public void notifyChanged(Notification notification) {
-			if (notification.getNotifier() instanceof ResourceSet) {
-				super.notifyChanged(notification);
-			}
-			if (!notification.isTouch() && myModifiedFilter.matches(notification)) {
-				if (notification.getNotifier() instanceof Resource) {
-					Resource resource = (Resource) notification.getNotifier();
-					if (resource.isLoaded()) {
-						boolean modified = false;
-						for (Iterator<Resource> it = myInfo.getLoadedResourcesIterator(); it.hasNext() && !modified;) {
-							Resource nextResource = (Resource) it.next();
-							if (nextResource.isLoaded()) {
-								modified = nextResource.isModified();
-							}
-						}
-						boolean dirtyStateChanged = false;
-						synchronized (myInfo) {
-							if (modified != myInfo.fCanBeSaved) {
-								myInfo.fCanBeSaved = modified;
-								dirtyStateChanged = true;
-							}
-							if (!resource.isModified()) {
-								myInfo.setSynchronized(resource);
-							}
-						}
-						if (dirtyStateChanged) {
-							fireElementDirtyStateChanged(myInfo.getEditorInput(), modified);
-							if (!modified) {
-								myInfo.setModificationStamp(computeModificationStamp(myInfo));
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.part;

+

+import java.io.IOException;

+import java.util.ArrayList;

+import java.util.Collections;

+import java.util.HashMap;

+import java.util.Iterator;

+import java.util.LinkedList;

+import java.util.List;

+import java.util.Map;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IResource;

+import org.eclipse.core.resources.IResourceStatus;

+import org.eclipse.core.resources.IStorage;

+import org.eclipse.core.resources.ResourcesPlugin;

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.Path;

+import org.eclipse.core.runtime.Status;

+import org.eclipse.core.runtime.jobs.ISchedulingRule;

+import org.eclipse.core.runtime.jobs.MultiRule;

+import org.eclipse.emf.common.notify.Adapter;

+import org.eclipse.emf.common.notify.Notification;

+import org.eclipse.emf.common.notify.Notifier;

+import org.eclipse.emf.common.ui.URIEditorInput;

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.resource.ResourceSet;

+import org.eclipse.emf.ecore.util.EContentAdapter;

+import org.eclipse.emf.ecore.util.EcoreUtil;

+import org.eclipse.emf.transaction.NotificationFilter;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.diagram.core.DiagramEditingDomainFactory;

+import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.AbstractDocumentProvider;

+import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.DiagramDocument;

+import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument;

+import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocumentProvider;

+import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument;

+import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorStatusCodes;

+import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.util.DiagramIOUtil;

+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.jface.operation.IRunnableContext;

+import org.eclipse.osgi.util.NLS;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.ui.IEditorInput;

+import org.eclipse.ui.part.FileEditorInput;

+

+/**

+ * @generated

+ */

+public class UMLDocumentProvider extends AbstractDocumentProvider implements IDiagramDocumentProvider {

+

+	/**

+	 * @generated

+	 */

+	protected ElementInfo createElementInfo(Object element) throws CoreException {

+		if(false == element instanceof FileEditorInput && false == element instanceof URIEditorInput) {

+			throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError, new Object[]{ element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ 

+			null));

+		}

+		IEditorInput editorInput = (IEditorInput)element;

+		IDiagramDocument document = (IDiagramDocument)createDocument(editorInput);

+

+		ResourceSetInfo info = new ResourceSetInfo(document, editorInput);

+		info.setModificationStamp(computeModificationStamp(info));

+		info.fStatus = null;

+		return info;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IDocument createDocument(Object element) throws CoreException {

+		if(false == element instanceof FileEditorInput && false == element instanceof URIEditorInput) {

+			throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError, new Object[]{ element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ 

+			null));

+		}

+		IDocument document = createEmptyDocument();

+		setDocumentContent(document, (IEditorInput)element);

+		setupDocument(element, document);

+		return document;

+	}

+

+	/**

+	 * Sets up the given document as it would be provided for the given element. The

+	 * content of the document is not changed. This default implementation is empty.

+	 * Subclasses may reimplement.

+	 * 

+	 * @param element

+	 *        the blue-print element

+	 * @param document

+	 *        the document to set up

+	 * @generated

+	 */

+	protected void setupDocument(Object element, IDocument document) {

+		// for subclasses

+	}

+

+	/**

+	 * @generated

+	 */

+	private long computeModificationStamp(ResourceSetInfo info) {

+		int result = 0;

+		for(Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

+			Resource nextResource = it.next();

+			IFile file = WorkspaceSynchronizer.getFile(nextResource);

+			if(file != null) {

+				if(file.getLocation() != null) {

+					result += file.getLocation().toFile().lastModified();

+				} else {

+					result += file.getModificationStamp();

+				}

+			}

+		}

+		return result;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IDocument createEmptyDocument() {

+		DiagramDocument document = new DiagramDocument();

+		document.setEditingDomain(createEditingDomain());

+		return document;

+	}

+

+	/**

+	 * @generated

+	 */

+	private TransactionalEditingDomain createEditingDomain() {

+		TransactionalEditingDomain editingDomain = DiagramEditingDomainFactory.getInstance().createEditingDomain();

+		editingDomain.setID("org.eclipse.papyrus.uml.diagram.composite.EditingDomain"); //$NON-NLS-1$

+		final NotificationFilter diagramResourceModifiedFilter = NotificationFilter.createNotifierFilter(editingDomain.getResourceSet()).and(NotificationFilter.createEventTypeFilter(Notification.ADD)).and(NotificationFilter.createFeatureFilter(ResourceSet.class, ResourceSet.RESOURCE_SET__RESOURCES));

+		editingDomain.getResourceSet().eAdapters().add(new Adapter() {

+

+			private Notifier myTarger;

+

+			public Notifier getTarget() {

+				return myTarger;

+			}

+

+			public boolean isAdapterForType(Object type) {

+				return false;

+			}

+

+			public void notifyChanged(Notification notification) {

+				if(diagramResourceModifiedFilter.matches(notification)) {

+					Object value = notification.getNewValue();

+					if(value instanceof Resource) {

+						((Resource)value).setTrackingModification(true);

+					}

+				}

+			}

+

+			public void setTarget(Notifier newTarget) {

+				myTarger = newTarget;

+			}

+

+		});

+

+		return editingDomain;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void setDocumentContent(IDocument document, IEditorInput element) throws CoreException {

+		IDiagramDocument diagramDocument = (IDiagramDocument)document;

+		TransactionalEditingDomain domain = diagramDocument.getEditingDomain();

+		if(element instanceof FileEditorInput) {

+			IStorage storage = ((FileEditorInput)element).getStorage();

+			Diagram diagram = DiagramIOUtil.load(domain, storage, true, getProgressMonitor());

+			document.setContent(diagram);

+		} else if(element instanceof URIEditorInput) {

+			URI uri = ((URIEditorInput)element).getURI();

+			Resource resource = null;

+			try {

+				resource = domain.getResourceSet().getResource(uri.trimFragment(), false);

+				if(resource == null) {

+					resource = domain.getResourceSet().createResource(uri.trimFragment());

+				}

+				if(!resource.isLoaded()) {

+					try {

+						@SuppressWarnings({ "rawtypes", "unchecked" })

+						Map<?, ?> options = new HashMap(GMFResourceFactory.getDefaultLoadOptions());

+						// @see 171060 

+						// options.put(org.eclipse.emf.ecore.xmi.XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, Boolean.TRUE);

+						resource.load(options);

+					} catch (IOException e) {

+						resource.unload();

+						throw e;

+					}

+				}

+				if(uri.fragment() != null) {

+					EObject rootElement = resource.getEObject(uri.fragment());

+					if(rootElement instanceof Diagram) {

+						document.setContent((Diagram)rootElement);

+						return;

+					}

+				} else {

+					for(Iterator<EObject> it = resource.getContents().iterator(); it.hasNext();) {

+						Object rootElement = it.next();

+						if(rootElement instanceof Diagram) {

+							document.setContent((Diagram)rootElement);

+							return;

+						}

+					}

+				}

+				throw new RuntimeException(Messages.UMLDocumentProvider_NoDiagramInResourceError);

+			} catch (Exception e) {

+				CoreException thrownExcp = null;

+				if(e instanceof CoreException) {

+					thrownExcp = (CoreException)e;

+				} else {

+					String msg = e.getLocalizedMessage();

+					thrownExcp = new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, msg != null ? msg : Messages.UMLDocumentProvider_DiagramLoadingError, e));

+				}

+				throw thrownExcp;

+			}

+		} else {

+			throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError, new Object[]{ element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ 

+			null));

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public long getModificationStamp(Object element) {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if(info != null) {

+			return computeModificationStamp(info);

+		}

+		return super.getModificationStamp(element);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean isDeleted(Object element) {

+		IDiagramDocument document = getDiagramDocument(element);

+		if(document != null) {

+			Resource diagramResource = document.getDiagram().eResource();

+			if(diagramResource != null) {

+				IFile file = WorkspaceSynchronizer.getFile(diagramResource);

+				return file == null || file.getLocation() == null || !file.getLocation().toFile().exists();

+			}

+		}

+		return super.isDeleted(element);

+	}

+

+	/**

+	 * @generated

+	 */

+	public ResourceSetInfo getResourceSetInfo(Object editorInput) {

+		return (ResourceSetInfo)super.getElementInfo(editorInput);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void disposeElementInfo(Object element, ElementInfo info) {

+		if(info instanceof ResourceSetInfo) {

+			ResourceSetInfo resourceSetInfo = (ResourceSetInfo)info;

+			resourceSetInfo.dispose();

+		}

+		super.disposeElementInfo(element, info);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doValidateState(Object element, Object computationContext) throws CoreException {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if(info != null) {

+			LinkedList<IFile> files2Validate = new LinkedList<IFile>();

+			for(Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

+				Resource nextResource = it.next();

+				IFile file = WorkspaceSynchronizer.getFile(nextResource);

+				if(file != null && file.isReadOnly()) {

+					files2Validate.add(file);

+				}

+			}

+			ResourcesPlugin.getWorkspace().validateEdit((IFile[])files2Validate.toArray(new IFile[files2Validate.size()]), computationContext);

+		}

+

+		super.doValidateState(element, computationContext);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean isReadOnly(Object element) {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if(info != null) {

+			if(info.isUpdateCache()) {

+				try {

+					updateCache(element);

+				} catch (CoreException ex) {

+					UMLDiagramEditorPlugin.getInstance().logError(Messages.UMLDocumentProvider_isModifiable, ex);

+					// Error message to log was initially taken from org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.StorageDocumentProvider_isModifiable

+				}

+			}

+			return info.isReadOnly();

+		}

+		return super.isReadOnly(element);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean isModifiable(Object element) {

+		if(!isStateValidated(element)) {

+			if(element instanceof FileEditorInput || element instanceof URIEditorInput) {

+				return true;

+			}

+		}

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if(info != null) {

+			if(info.isUpdateCache()) {

+				try {

+					updateCache(element);

+				} catch (CoreException ex) {

+					UMLDiagramEditorPlugin.getInstance().logError(Messages.UMLDocumentProvider_isModifiable, ex);

+					// Error message to log was initially taken from org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.StorageDocumentProvider_isModifiable

+				}

+			}

+			return info.isModifiable();

+		}

+		return super.isModifiable(element);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void updateCache(Object element) throws CoreException {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if(info != null) {

+			for(Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

+				Resource nextResource = it.next();

+				IFile file = WorkspaceSynchronizer.getFile(nextResource);

+				if(file != null && file.isReadOnly()) {

+					info.setReadOnly(true);

+					info.setModifiable(false);

+					return;

+				}

+			}

+			info.setReadOnly(false);

+			info.setModifiable(true);

+			return;

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doUpdateStateCache(Object element) throws CoreException {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if(info != null) {

+			info.setUpdateCache(true);

+		}

+		super.doUpdateStateCache(element);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean isSynchronized(Object element) {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if(info != null) {

+			return info.isSynchronized();

+		}

+		return super.isSynchronized(element);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected ISchedulingRule getResetRule(Object element) {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if(info != null) {

+			LinkedList<ISchedulingRule> rules = new LinkedList<ISchedulingRule>();

+			for(Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

+				Resource nextResource = it.next();

+				IFile file = WorkspaceSynchronizer.getFile(nextResource);

+				if(file != null) {

+					rules.add(ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(file));

+				}

+			}

+			return new MultiRule((ISchedulingRule[])rules.toArray(new ISchedulingRule[rules.size()]));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected ISchedulingRule getSaveRule(Object element) {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if(info != null) {

+			LinkedList<ISchedulingRule> rules = new LinkedList<ISchedulingRule>();

+			for(Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

+				Resource nextResource = it.next();

+				IFile file = WorkspaceSynchronizer.getFile(nextResource);

+				if(file != null) {

+					rules.add(computeSchedulingRule(file));

+				}

+			}

+			return new MultiRule((ISchedulingRule[])rules.toArray(new ISchedulingRule[rules.size()]));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected ISchedulingRule getSynchronizeRule(Object element) {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if(info != null) {

+			LinkedList<ISchedulingRule> rules = new LinkedList<ISchedulingRule>();

+			for(Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

+				Resource nextResource = it.next();

+				IFile file = WorkspaceSynchronizer.getFile(nextResource);

+				if(file != null) {

+					rules.add(ResourcesPlugin.getWorkspace().getRuleFactory().refreshRule(file));

+				}

+			}

+			return new MultiRule((ISchedulingRule[])rules.toArray(new ISchedulingRule[rules.size()]));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected ISchedulingRule getValidateStateRule(Object element) {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if(info != null) {

+			LinkedList<ISchedulingRule> files = new LinkedList<ISchedulingRule>();

+			for(Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

+				Resource nextResource = it.next();

+				IFile file = WorkspaceSynchronizer.getFile(nextResource);

+				if(file != null) {

+					files.add(file);

+				}

+			}

+			return ResourcesPlugin.getWorkspace().getRuleFactory().validateEditRule((IFile[])files.toArray(new IFile[files.size()]));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ISchedulingRule computeSchedulingRule(IResource toCreateOrModify) {

+		if(toCreateOrModify.exists())

+			return ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(toCreateOrModify);

+

+		IResource parent = toCreateOrModify;

+		do {

+			/*

+			 * XXX This is a workaround for

+			 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=67601

+			 * IResourceRuleFactory.createRule should iterate the hierarchy

+			 * itself.

+			 */

+			toCreateOrModify = parent;

+			parent = toCreateOrModify.getParent();

+		} while(parent != null && !parent.exists());

+

+		return ResourcesPlugin.getWorkspace().getRuleFactory().createRule(toCreateOrModify);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doSynchronize(Object element, IProgressMonitor monitor) throws CoreException {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if(info != null) {

+			for(Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

+				Resource nextResource = it.next();

+				handleElementChanged(info, nextResource, monitor);

+			}

+			return;

+		}

+		super.doSynchronize(element, monitor);

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite) throws CoreException {

+		ResourceSetInfo info = getResourceSetInfo(element);

+		if(info != null) {

+			if(!overwrite && !info.isSynchronized()) {

+				throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, IResourceStatus.OUT_OF_SYNC_LOCAL, Messages.UMLDocumentProvider_UnsynchronizedFileSaveError, null));

+			}

+			info.stopResourceListening();

+			fireElementStateChanging(element);

+			try {

+				monitor.beginTask(Messages.UMLDocumentProvider_SaveDiagramTask, info.getResourceSet().getResources().size() + 1); //"Saving diagram"

+				for(Iterator<Resource> it = info.getLoadedResourcesIterator(); it.hasNext();) {

+					Resource nextResource = it.next();

+					monitor.setTaskName(NLS.bind(Messages.UMLDocumentProvider_SaveNextResourceTask, nextResource.getURI()));

+					if(nextResource.isLoaded() && !info.getEditingDomain().isReadOnly(nextResource)) {

+						try {

+							nextResource.save(UMLDiagramEditorUtil.getSaveOptions());

+						} catch (IOException e) {

+							fireElementStateChangeFailed(element);

+							throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, EditorStatusCodes.RESOURCE_FAILURE, e.getLocalizedMessage(), null));

+						}

+					}

+					monitor.worked(1);

+				}

+				monitor.done();

+				info.setModificationStamp(computeModificationStamp(info));

+			} catch (RuntimeException x) {

+				fireElementStateChangeFailed(element);

+				throw x;

+			} finally {

+				info.startResourceListening();

+			}

+		} else {

+			URI newResoruceURI;

+			List<IFile> affectedFiles = null;

+			if(element instanceof FileEditorInput) {

+				IFile newFile = ((FileEditorInput)element).getFile();

+				affectedFiles = Collections.singletonList(newFile);

+				newResoruceURI = URI.createPlatformResourceURI(newFile.getFullPath().toString(), true);

+			} else if(element instanceof URIEditorInput) {

+				newResoruceURI = ((URIEditorInput)element).getURI();

+			} else {

+				fireElementStateChangeFailed(element);

+				throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, NLS.bind(Messages.UMLDocumentProvider_IncorrectInputError, new Object[]{ element, "org.eclipse.ui.part.FileEditorInput", "org.eclipse.emf.common.ui.URIEditorInput" }), //$NON-NLS-1$ //$NON-NLS-2$ 

+				null));

+			}

+			if(false == document instanceof IDiagramDocument) {

+				fireElementStateChangeFailed(element);

+				throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, "Incorrect document used: " + document + " instead of org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument", null)); //$NON-NLS-1$ //$NON-NLS-2$

+			}

+			IDiagramDocument diagramDocument = (IDiagramDocument)document;

+			final Resource newResource = diagramDocument.getEditingDomain().getResourceSet().createResource(newResoruceURI);

+			final Diagram diagramCopy = (Diagram)EcoreUtil.copy(diagramDocument.getDiagram());

+			try {

+				new AbstractTransactionalCommand(diagramDocument.getEditingDomain(), NLS.bind(Messages.UMLDocumentProvider_SaveAsOperation, diagramCopy.getName()), affectedFiles) {

+

+					protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+						newResource.getContents().add(diagramCopy);

+						return CommandResult.newOKCommandResult();

+					}

+				}.execute(monitor, null);

+				newResource.save(UMLDiagramEditorUtil.getSaveOptions());

+			} catch (ExecutionException e) {

+				fireElementStateChangeFailed(element);

+				throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, e.getLocalizedMessage(), null));

+			} catch (IOException e) {

+				fireElementStateChangeFailed(element);

+				throw new CoreException(new Status(IStatus.ERROR, UMLDiagramEditorPlugin.ID, 0, e.getLocalizedMessage(), null));

+			}

+			newResource.unload();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleElementChanged(ResourceSetInfo info, Resource changedResource, IProgressMonitor monitor) {

+		IFile file = WorkspaceSynchronizer.getFile(changedResource);

+		if(file != null) {

+			try {

+				file.refreshLocal(IResource.DEPTH_INFINITE, monitor);

+			} catch (CoreException ex) {

+				UMLDiagramEditorPlugin.getInstance().logError(Messages.UMLDocumentProvider_handleElementContentChanged, ex);

+				// Error message to log was initially taken from org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.FileDocumentProvider_handleElementContentChanged

+			}

+		}

+		changedResource.unload();

+

+		fireElementContentAboutToBeReplaced(info.getEditorInput());

+		removeUnchangedElementListeners(info.getEditorInput(), info);

+		info.fStatus = null;

+		try {

+			setDocumentContent(info.fDocument, info.getEditorInput());

+		} catch (CoreException e) {

+			info.fStatus = e.getStatus();

+		}

+		if(!info.fCanBeSaved) {

+			info.setModificationStamp(computeModificationStamp(info));

+		}

+		addUnchangedElementListeners(info.getEditorInput(), info);

+		fireElementContentReplaced(info.getEditorInput());

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void handleElementMoved(IEditorInput input, URI uri) {

+		if(input instanceof FileEditorInput) {

+			IFile newFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(URI.decode(uri.path())).removeFirstSegments(1));

+			fireElementMoved(input, newFile == null ? null : new FileEditorInput(newFile));

+			return;

+		}

+		// TODO: append suffix to the URI! (use diagram as a parameter)

+		fireElementMoved(input, new URIEditorInput(uri));

+	}

+

+	/**

+	 * @generated

+	 */

+	public IEditorInput createInputWithEditingDomain(IEditorInput editorInput, TransactionalEditingDomain domain) {

+		return editorInput;

+	}

+

+	/**

+	 * @generated

+	 */

+	public IDiagramDocument getDiagramDocument(Object element) {

+		IDocument doc = getDocument(element);

+		if(doc instanceof IDiagramDocument) {

+			return (IDiagramDocument)doc;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IRunnableContext getOperationRunner(IProgressMonitor monitor) {

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected class ResourceSetInfo extends ElementInfo {

+

+		/**

+		 * @generated

+		 */

+		private long myModificationStamp = IResource.NULL_STAMP;

+

+		/**

+		 * @generated

+		 */

+		private WorkspaceSynchronizer mySynchronizer;

+

+		/**

+		 * @generated

+		 */

+		private LinkedList<Resource> myUnSynchronizedResources = new LinkedList<Resource>();

+

+		/**

+		 * @generated

+		 */

+		private IDiagramDocument myDocument;

+

+		/**

+		 * @generated

+		 */

+		private IEditorInput myEditorInput;

+

+		/**

+		 * @generated

+		 */

+		private boolean myUpdateCache = true;

+

+		/**

+		 * @generated

+		 */

+		private boolean myModifiable = false;

+

+		/**

+		 * @generated

+		 */

+		private boolean myReadOnly = true;

+

+		/**

+		 * @generated

+		 */

+		private ResourceSetModificationListener myResourceSetListener;

+

+		/**

+		 * @generated

+		 */

+		public ResourceSetInfo(IDiagramDocument document, IEditorInput editorInput) {

+			super(document);

+			myDocument = document;

+			myEditorInput = editorInput;

+			startResourceListening();

+			myResourceSetListener = new ResourceSetModificationListener(this);

+			getResourceSet().eAdapters().add(myResourceSetListener);

+		}

+

+		/**

+		 * @generated

+		 */

+		public long getModificationStamp() {

+			return myModificationStamp;

+		}

+

+		/**

+		 * @generated

+		 */

+		public void setModificationStamp(long modificationStamp) {

+			myModificationStamp = modificationStamp;

+		}

+

+		/**

+		 * @generated

+		 */

+		public TransactionalEditingDomain getEditingDomain() {

+			return myDocument.getEditingDomain();

+		}

+

+		/**

+		 * @generated

+		 */

+		public ResourceSet getResourceSet() {

+			return getEditingDomain().getResourceSet();

+		}

+

+		/**

+		 * @generated

+		 */

+		public Iterator<Resource> getLoadedResourcesIterator() {

+			return new ArrayList<Resource>(getResourceSet().getResources()).iterator();

+		}

+

+		/**

+		 * @generated

+		 */

+		public IEditorInput getEditorInput() {

+			return myEditorInput;

+		}

+

+		/**

+		 * @generated

+		 */

+		public void dispose() {

+			stopResourceListening();

+			getResourceSet().eAdapters().remove(myResourceSetListener);

+			for(Iterator<Resource> it = getLoadedResourcesIterator(); it.hasNext();) {

+				Resource resource = it.next();

+				resource.unload();

+			}

+			getEditingDomain().dispose();

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean isSynchronized() {

+			return myUnSynchronizedResources.size() == 0;

+		}

+

+		/**

+		 * @generated

+		 */

+		public void setUnSynchronized(Resource resource) {

+			myUnSynchronizedResources.add(resource);

+		}

+

+		/**

+		 * @generated

+		 */

+		public void setSynchronized(Resource resource) {

+			myUnSynchronizedResources.remove(resource);

+		}

+

+		/**

+		 * @generated

+		 */

+		public final void stopResourceListening() {

+			mySynchronizer.dispose();

+			mySynchronizer = null;

+		}

+

+		/**

+		 * @generated

+		 */

+		public final void startResourceListening() {

+			mySynchronizer = new WorkspaceSynchronizer(getEditingDomain(), new SynchronizerDelegate());

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean isUpdateCache() {

+			return myUpdateCache;

+		}

+

+		/**

+		 * @generated

+		 */

+		public void setUpdateCache(boolean update) {

+			myUpdateCache = update;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean isModifiable() {

+			return myModifiable;

+		}

+

+		/**

+		 * @generated

+		 */

+		public void setModifiable(boolean modifiable) {

+			myModifiable = modifiable;

+		}

+

+		/**

+		 * @generated

+		 */

+		public boolean isReadOnly() {

+			return myReadOnly;

+		}

+

+		/**

+		 * @generated

+		 */

+		public void setReadOnly(boolean readOnly) {

+			myReadOnly = readOnly;

+		}

+

+		/**

+		 * @generated

+		 */

+		private class SynchronizerDelegate implements WorkspaceSynchronizer.Delegate {

+

+			/**

+			 * @generated

+			 */

+			public void dispose() {

+			}

+

+			/**

+			 * @generated

+			 */

+			public boolean handleResourceChanged(final Resource resource) {

+				synchronized(ResourceSetInfo.this) {

+					if(ResourceSetInfo.this.fCanBeSaved) {

+						ResourceSetInfo.this.setUnSynchronized(resource);

+						return true;

+					}

+				}

+				Display.getDefault().asyncExec(new Runnable() {

+

+					public void run() {

+						handleElementChanged(ResourceSetInfo.this, resource, null);

+					}

+				});

+				return true;

+			}

+

+			/**

+			 * @generated

+			 */

+			public boolean handleResourceDeleted(Resource resource) {

+				synchronized(ResourceSetInfo.this) {

+					if(ResourceSetInfo.this.fCanBeSaved) {

+						ResourceSetInfo.this.setUnSynchronized(resource);

+						return true;

+					}

+				}

+				Display.getDefault().asyncExec(new Runnable() {

+

+					public void run() {

+						fireElementDeleted(ResourceSetInfo.this.getEditorInput());

+					}

+				});

+				return true;

+			}

+

+			/**

+			 * @generated

+			 */

+			public boolean handleResourceMoved(Resource resource, final URI newURI) {

+				synchronized(ResourceSetInfo.this) {

+					if(ResourceSetInfo.this.fCanBeSaved) {

+						ResourceSetInfo.this.setUnSynchronized(resource);

+						return true;

+					}

+				}

+				if(myDocument.getDiagram().eResource() == resource) {

+					Display.getDefault().asyncExec(new Runnable() {

+

+						public void run() {

+							handleElementMoved(ResourceSetInfo.this.getEditorInput(), newURI);

+						}

+					});

+				} else {

+					handleResourceDeleted(resource);

+				}

+				return true;

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private class ResourceSetModificationListener extends EContentAdapter {

+

+		/**

+		 * @generated

+		 */

+		private NotificationFilter myModifiedFilter;

+

+		/**

+		 * @generated

+		 */

+		private ResourceSetInfo myInfo;

+

+		/**

+		 * @generated

+		 */

+		public ResourceSetModificationListener(ResourceSetInfo info) {

+			myInfo = info;

+			myModifiedFilter = NotificationFilter.createEventTypeFilter(Notification.SET).or(NotificationFilter.createEventTypeFilter(Notification.UNSET)).and(NotificationFilter.createFeatureFilter(Resource.class, Resource.RESOURCE__IS_MODIFIED));

+		}

+

+		/**

+		 * @generated

+		 */

+		public void notifyChanged(Notification notification) {

+			if(notification.getNotifier() instanceof ResourceSet) {

+				super.notifyChanged(notification);

+			}

+			if(!notification.isTouch() && myModifiedFilter.matches(notification)) {

+				if(notification.getNotifier() instanceof Resource) {

+					Resource resource = (Resource)notification.getNotifier();

+					if(resource.isLoaded()) {

+						boolean modified = false;

+						for(Iterator<Resource> it = myInfo.getLoadedResourcesIterator(); it.hasNext() && !modified;) {

+							Resource nextResource = (Resource)it.next();

+							if(nextResource.isLoaded()) {

+								modified = nextResource.isModified();

+							}

+						}

+						boolean dirtyStateChanged = false;

+						synchronized(myInfo) {

+							if(modified != myInfo.fCanBeSaved) {

+								myInfo.fCanBeSaved = modified;

+								dirtyStateChanged = true;

+							}

+							if(!resource.isModified()) {

+								myInfo.setSynchronized(resource);

+							}

+						}

+						if(dirtyStateChanged) {

+							fireElementDirtyStateChanged(myInfo.getEditorInput(), modified);

+

+							if(!modified) {

+								myInfo.setModificationStamp(computeModificationStamp(myInfo));

+							}

+						}

+					}

+				}

+			}

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLInitDiagramFileAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLInitDiagramFileAction.java
index 924d603f1d5..2fb4b38df88 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLInitDiagramFileAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLInitDiagramFileAction.java
@@ -1,102 +1,97 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.part;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * @generated
- */
-public class UMLInitDiagramFileAction implements IObjectActionDelegate {
-	/**
-	 * @generated
-	 */
-	private IWorkbenchPart targetPart;
-	/**
-	 * @generated
-	 */
-	private URI domainModelURI;
-
-	/**
-	 * @generated
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		this.targetPart = targetPart;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		domainModelURI = null;
-		action.setEnabled(false);
-		if (selection instanceof IStructuredSelection == false || selection.isEmpty()) {
-			return;
-		}
-		IFile file =
-				(IFile) ((IStructuredSelection) selection).getFirstElement();
-		domainModelURI = URI.createPlatformResourceURI(file.getFullPath().toString(), true);
-		action.setEnabled(true);
-	}
-
-	/**
-	 * @generated
-	 */
-	private Shell getShell() {
-		return targetPart.getSite().getShell();
-	}
-
-	/**
-	 * @generated
-	 */
-	public void run(IAction action) {
-		TransactionalEditingDomain editingDomain =
-				GMFEditingDomainFactory.INSTANCE.createEditingDomain();
-		ResourceSet resourceSet = editingDomain.getResourceSet();
-		EObject diagramRoot = null;
-		try {
-			Resource resource = resourceSet.getResource(domainModelURI, true);
-			diagramRoot = (EObject) resource.getContents().get(0);
-		} catch (WrappedException ex) {
-			UMLDiagramEditorPlugin.getInstance().logError(
-					"Unable to load resource: " + domainModelURI, ex); //$NON-NLS-1$
-		}
-		if (diagramRoot == null) {
-			MessageDialog.openError(getShell(),
-					Messages.InitDiagramFile_ResourceErrorDialogTitle,
-					Messages.InitDiagramFile_ResourceErrorDialogMessage);
-			return;
-		}
-		Wizard wizard = new UMLNewDiagramFileWizard(domainModelURI, diagramRoot, editingDomain);
-		wizard.setWindowTitle(NLS.bind(
-				Messages.InitDiagramFile_WizardTitle,
-				CompositeStructureDiagramEditPart.MODEL_ID));
-		UMLDiagramEditorUtil.runWizard(getShell(), wizard, "InitDiagramFile"); //$NON-NLS-1$
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.part;

+

+import org.eclipse.core.resources.IFile;

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.common.util.WrappedException;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.resource.ResourceSet;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;

+import org.eclipse.jface.action.IAction;

+import org.eclipse.jface.dialogs.MessageDialog;

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.jface.wizard.Wizard;

+import org.eclipse.osgi.util.NLS;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.ui.IObjectActionDelegate;

+import org.eclipse.ui.IWorkbenchPart;

+

+/**

+ * @generated

+ */

+public class UMLInitDiagramFileAction implements IObjectActionDelegate {

+

+	/**

+	 * @generated

+	 */

+	private IWorkbenchPart targetPart;

+

+	/**

+	 * @generated

+	 */

+	private URI domainModelURI;

+

+	/**

+	 * @generated

+	 */

+	public void setActivePart(IAction action, IWorkbenchPart targetPart) {

+		this.targetPart = targetPart;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void selectionChanged(IAction action, ISelection selection) {

+		domainModelURI = null;

+		action.setEnabled(false);

+		if(selection instanceof IStructuredSelection == false || selection.isEmpty()) {

+			return;

+		}

+		IFile file = (IFile)((IStructuredSelection)selection).getFirstElement();

+		domainModelURI = URI.createPlatformResourceURI(file.getFullPath().toString(), true);

+		action.setEnabled(true);

+	}

+

+	/**

+	 * @generated

+	 */

+	private Shell getShell() {

+		return targetPart.getSite().getShell();

+	}

+

+	/**

+	 * @generated

+	 */

+	public void run(IAction action) {

+		TransactionalEditingDomain editingDomain = GMFEditingDomainFactory.INSTANCE.createEditingDomain();

+		ResourceSet resourceSet = editingDomain.getResourceSet();

+		EObject diagramRoot = null;

+		try {

+			Resource resource = resourceSet.getResource(domainModelURI, true);

+			diagramRoot = (EObject)resource.getContents().get(0);

+		} catch (WrappedException ex) {

+			UMLDiagramEditorPlugin.getInstance().logError("Unable to load resource: " + domainModelURI, ex); //$NON-NLS-1$

+		}

+		if(diagramRoot == null) {

+			MessageDialog.openError(getShell(), Messages.InitDiagramFile_ResourceErrorDialogTitle, Messages.InitDiagramFile_ResourceErrorDialogMessage);

+			return;

+		}

+		Wizard wizard = new UMLNewDiagramFileWizard(domainModelURI, diagramRoot, editingDomain);

+		wizard.setWindowTitle(NLS.bind(Messages.InitDiagramFile_WizardTitle, CompositeStructureDiagramEditPart.MODEL_ID));

+		UMLDiagramEditorUtil.runWizard(getShell(), wizard, "InitDiagramFile"); //$NON-NLS-1$

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLLinkDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLLinkDescriptor.java
index b4c3d74f1e3..42e20a57795 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLLinkDescriptor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLLinkDescriptor.java
@@ -1,35 +1,36 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.part;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.tooling.runtime.update.UpdaterLinkDescriptor;
-
-/**
- * @generated
- */
-public class UMLLinkDescriptor extends UpdaterLinkDescriptor {
-	/**
-	 * @generated
-	 */
-	public UMLLinkDescriptor(EObject source, EObject destination, IElementType elementType, int linkVID) {
-		super(source, destination, elementType, linkVID);
-	}
-
-	/**
-	 * @generated
-	 */
-	public UMLLinkDescriptor(EObject source, EObject destination, EObject linkElement, IElementType elementType, int linkVID) {
-		super(source, destination, linkElement, elementType, linkVID);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.part;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.tooling.runtime.update.UpdaterLinkDescriptor;

+

+/**

+ * @generated

+ */

+public class UMLLinkDescriptor extends UpdaterLinkDescriptor {

+

+	/**

+	 * @generated

+	 */

+	public UMLLinkDescriptor(EObject source, EObject destination, IElementType elementType, int linkVID) {

+		super(source, destination, elementType, linkVID);

+	}

+

+	/**

+	 * @generated

+	 */

+	public UMLLinkDescriptor(EObject source, EObject destination, EObject linkElement, IElementType elementType, int linkVID) {

+		super(source, destination, linkElement, elementType, linkVID);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLMatchingStrategy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLMatchingStrategy.java
index 8f2a69afca9..965a5ee1f59 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLMatchingStrategy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLMatchingStrategy.java
@@ -1,42 +1,44 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.part;
-
-import org.eclipse.emf.common.ui.URIEditorInput;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorMatchingStrategy;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.PartInitException;
-
-/**
- * @generated
- */
-public class UMLMatchingStrategy implements IEditorMatchingStrategy {
-	/**
-	 * @generated
-	 */
-	public boolean matches(IEditorReference editorRef, IEditorInput input) {
-		IEditorInput editorInput;
-		try {
-			editorInput = editorRef.getEditorInput();
-		} catch (PartInitException e) {
-			return false;
-		}
-		if (editorInput.equals(input)) {
-			return true;
-		}
-		if (editorInput instanceof URIEditorInput && input instanceof URIEditorInput) {
-			return ((URIEditorInput) editorInput).getURI().equals(((URIEditorInput) input).getURI());
-		}
-		return false;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.part;

+

+import org.eclipse.emf.common.ui.URIEditorInput;

+import org.eclipse.ui.IEditorInput;

+import org.eclipse.ui.IEditorMatchingStrategy;

+import org.eclipse.ui.IEditorReference;

+import org.eclipse.ui.PartInitException;

+

+/**

+ * @generated

+ */

+public class UMLMatchingStrategy implements IEditorMatchingStrategy {

+

+	/**

+	 * @generated

+	 */

+	public boolean matches(IEditorReference editorRef, IEditorInput input) {

+		IEditorInput editorInput;

+		try {

+			editorInput = editorRef.getEditorInput();

+		} catch (PartInitException e) {

+			return false;

+		}

+

+		if(editorInput.equals(input)) {

+			return true;

+		}

+		if(editorInput instanceof URIEditorInput && input instanceof URIEditorInput) {

+			return ((URIEditorInput)editorInput).getURI().equals(((URIEditorInput)input).getURI());

+		}

+		return false;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLNewDiagramFileWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLNewDiagramFileWizard.java
index 43913b82fde..9d89c443296 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLNewDiagramFileWizard.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLNewDiagramFileWizard.java
@@ -1,184 +1,173 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.part;
-
-import java.io.IOException;
-import java.util.LinkedList;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.OperationHistoryFactory;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-
-/**
- * @generated
- */
-public class UMLNewDiagramFileWizard extends Wizard {
-	/**
-	 * @generated
-	 */
-	private WizardNewFileCreationPage myFileCreationPage;
-	/**
-	 * @generated
-	 */
-	private ModelElementSelectionPage diagramRootElementSelectionPage;
-	/**
-	 * @generated
-	 */
-	private TransactionalEditingDomain myEditingDomain;
-
-	/**
-	 * @generated
-	 */
-	public UMLNewDiagramFileWizard(URI domainModelURI,
-			EObject diagramRoot,
-			TransactionalEditingDomain editingDomain) {
-		assert domainModelURI != null : "Domain model uri must be specified"; //$NON-NLS-1$
-		assert diagramRoot != null : "Doagram root element must be specified"; //$NON-NLS-1$
-		assert editingDomain != null : "Editing domain must be specified"; //$NON-NLS-1$
-		myFileCreationPage = new WizardNewFileCreationPage
-				(Messages.UMLNewDiagramFileWizard_CreationPageName, StructuredSelection.EMPTY);
-		myFileCreationPage.setTitle(Messages.UMLNewDiagramFileWizard_CreationPageTitle);
-		myFileCreationPage.setDescription(NLS.bind(
-				Messages.UMLNewDiagramFileWizard_CreationPageDescription,
-				CompositeStructureDiagramEditPart.MODEL_ID));
-		IPath filePath;
-		String fileName = URI.decode(domainModelURI.trimFileExtension().lastSegment());
-		if (domainModelURI.isPlatformResource()) {
-			filePath = new Path(domainModelURI.trimSegments(1).toPlatformString(true));
-		} else if (domainModelURI.isFile()) {
-			filePath = new Path(domainModelURI.trimSegments(1).toFileString());
-		} else {
-			// TODO : use some default path
-			throw new IllegalArgumentException("Unsupported URI: " + domainModelURI); //$NON-NLS-1$
-		}
-		myFileCreationPage.setContainerFullPath(filePath);
-		myFileCreationPage.setFileName(UMLDiagramEditorUtil.getUniqueFileName(
-				filePath, fileName, "uml_csd")); //$NON-NLS-1$
-		diagramRootElementSelectionPage = new DiagramRootElementSelectionPage(Messages.UMLNewDiagramFileWizard_RootSelectionPageName);
-		diagramRootElementSelectionPage.setTitle(Messages.UMLNewDiagramFileWizard_RootSelectionPageTitle);
-		diagramRootElementSelectionPage.setDescription(Messages.UMLNewDiagramFileWizard_RootSelectionPageDescription);
-		diagramRootElementSelectionPage.setModelElement(diagramRoot);
-		myEditingDomain = editingDomain;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void addPages() {
-		addPage(myFileCreationPage);
-		addPage(diagramRootElementSelectionPage);
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean performFinish() {
-		LinkedList<IFile> affectedFiles = new LinkedList<IFile>();
-		IFile diagramFile = myFileCreationPage.createNewFile();
-		UMLDiagramEditorUtil.setCharset(diagramFile);
-		affectedFiles.add(diagramFile);
-		URI diagramModelURI = URI.createPlatformResourceURI(diagramFile.getFullPath().toString(), true);
-		ResourceSet resourceSet = myEditingDomain.getResourceSet();
-		final Resource diagramResource = resourceSet.createResource(diagramModelURI);
-		AbstractTransactionalCommand command =
-				new AbstractTransactionalCommand(
-						myEditingDomain, Messages.UMLNewDiagramFileWizard_InitDiagramCommand, affectedFiles) {
-					protected CommandResult doExecuteWithResult(
-							IProgressMonitor monitor, IAdaptable info)
-							throws ExecutionException {
-						int diagramVID = UMLVisualIDRegistry.getDiagramVisualID(diagramRootElementSelectionPage.getModelElement());
-						if (diagramVID != CompositeStructureDiagramEditPart.VISUAL_ID) {
-							return CommandResult.newErrorCommandResult(
-									Messages.UMLNewDiagramFileWizard_IncorrectRootError);
-						}
-						Diagram diagram =
-								ViewService.createDiagram(
-										diagramRootElementSelectionPage.getModelElement(), CompositeStructureDiagramEditPart.MODEL_ID,
-										UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
-						diagramResource.getContents().add(diagram);
-						new UMLDiagramContentInitializer().initDiagramContent(diagram);
-						return CommandResult.newOKCommandResult();
-					}
-				};
-		try {
-			OperationHistoryFactory.getOperationHistory().execute(
-					command, new NullProgressMonitor(), null);
-			diagramResource.save(UMLDiagramEditorUtil.getSaveOptions());
-			UMLDiagramEditorUtil.openDiagram(diagramResource);
-		} catch (ExecutionException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Unable to create model and diagram", e); //$NON-NLS-1$
-		} catch (IOException ex) {
-			UMLDiagramEditorPlugin.getInstance().logError(
-					"Save operation failed for: " + diagramModelURI, ex); //$NON-NLS-1$
-		} catch (PartInitException ex) {
-			UMLDiagramEditorPlugin.getInstance().logError("Unable to open editor", ex); //$NON-NLS-1$
-		}
-		return true;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class DiagramRootElementSelectionPage extends ModelElementSelectionPage {
-		/**
-		 * @generated
-		 */
-		protected DiagramRootElementSelectionPage(String pageName) {
-			super(pageName);
-		}
-
-		/**
-		 * @generated
-		 */
-		protected String getSelectionTitle() {
-			return Messages.UMLNewDiagramFileWizard_RootSelectionPageSelectionTitle;
-		}
-
-		/**
-		 * @generated
-		 */
-		protected boolean validatePage() {
-			if (getModelElement() == null) {
-				setErrorMessage(Messages.UMLNewDiagramFileWizard_RootSelectionPageNoSelectionMessage);
-				return false;
-			}
-			boolean result = ViewService.getInstance().provides(
-					new CreateDiagramViewOperation(
-							new EObjectAdapter(getModelElement()),
-							CompositeStructureDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT));
-			setErrorMessage(result ? null : Messages.UMLNewDiagramFileWizard_RootSelectionPageInvalidSelectionMessage);
-			return result;
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.part;

+

+import java.io.IOException;

+import java.util.LinkedList;

+

+import org.eclipse.core.commands.ExecutionException;

+import org.eclipse.core.commands.operations.OperationHistoryFactory;

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.core.runtime.IPath;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.core.runtime.NullProgressMonitor;

+import org.eclipse.core.runtime.Path;

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.resource.ResourceSet;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gmf.runtime.common.core.command.CommandResult;

+import org.eclipse.gmf.runtime.diagram.core.services.ViewService;

+import org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation;

+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

+import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.jface.viewers.StructuredSelection;

+import org.eclipse.jface.wizard.Wizard;

+import org.eclipse.osgi.util.NLS;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

+import org.eclipse.ui.PartInitException;

+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;

+

+/**

+ * @generated

+ */

+public class UMLNewDiagramFileWizard extends Wizard {

+

+	/**

+	 * @generated

+	 */

+	private WizardNewFileCreationPage myFileCreationPage;

+

+	/**

+	 * @generated

+	 */

+	private ModelElementSelectionPage diagramRootElementSelectionPage;

+

+	/**

+	 * @generated

+	 */

+	private TransactionalEditingDomain myEditingDomain;

+

+	/**

+	 * @generated

+	 */

+	public UMLNewDiagramFileWizard(URI domainModelURI, EObject diagramRoot, TransactionalEditingDomain editingDomain) {

+		assert domainModelURI != null : "Domain model uri must be specified"; //$NON-NLS-1$

+		assert diagramRoot != null : "Doagram root element must be specified"; //$NON-NLS-1$

+		assert editingDomain != null : "Editing domain must be specified"; //$NON-NLS-1$

+

+		myFileCreationPage = new WizardNewFileCreationPage(Messages.UMLNewDiagramFileWizard_CreationPageName, StructuredSelection.EMPTY);

+		myFileCreationPage.setTitle(Messages.UMLNewDiagramFileWizard_CreationPageTitle);

+		myFileCreationPage.setDescription(NLS.bind(Messages.UMLNewDiagramFileWizard_CreationPageDescription, CompositeStructureDiagramEditPart.MODEL_ID));

+		IPath filePath;

+		String fileName = URI.decode(domainModelURI.trimFileExtension().lastSegment());

+		if(domainModelURI.isPlatformResource()) {

+			filePath = new Path(domainModelURI.trimSegments(1).toPlatformString(true));

+		} else if(domainModelURI.isFile()) {

+			filePath = new Path(domainModelURI.trimSegments(1).toFileString());

+		} else {

+			// TODO : use some default path

+			throw new IllegalArgumentException("Unsupported URI: " + domainModelURI); //$NON-NLS-1$

+		}

+		myFileCreationPage.setContainerFullPath(filePath);

+		myFileCreationPage.setFileName(UMLDiagramEditorUtil.getUniqueFileName(filePath, fileName, "uml_csd")); //$NON-NLS-1$

+

+		diagramRootElementSelectionPage = new DiagramRootElementSelectionPage(Messages.UMLNewDiagramFileWizard_RootSelectionPageName);

+		diagramRootElementSelectionPage.setTitle(Messages.UMLNewDiagramFileWizard_RootSelectionPageTitle);

+		diagramRootElementSelectionPage.setDescription(Messages.UMLNewDiagramFileWizard_RootSelectionPageDescription);

+		diagramRootElementSelectionPage.setModelElement(diagramRoot);

+

+		myEditingDomain = editingDomain;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void addPages() {

+		addPage(myFileCreationPage);

+		addPage(diagramRootElementSelectionPage);

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean performFinish() {

+		LinkedList<IFile> affectedFiles = new LinkedList<IFile>();

+		IFile diagramFile = myFileCreationPage.createNewFile();

+		UMLDiagramEditorUtil.setCharset(diagramFile);

+		affectedFiles.add(diagramFile);

+		URI diagramModelURI = URI.createPlatformResourceURI(diagramFile.getFullPath().toString(), true);

+		ResourceSet resourceSet = myEditingDomain.getResourceSet();

+		final Resource diagramResource = resourceSet.createResource(diagramModelURI);

+		AbstractTransactionalCommand command = new AbstractTransactionalCommand(myEditingDomain, Messages.UMLNewDiagramFileWizard_InitDiagramCommand, affectedFiles) {

+

+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

+				int diagramVID = UMLVisualIDRegistry.getDiagramVisualID(diagramRootElementSelectionPage.getModelElement());

+				if(diagramVID != CompositeStructureDiagramEditPart.VISUAL_ID) {

+					return CommandResult.newErrorCommandResult(Messages.UMLNewDiagramFileWizard_IncorrectRootError);

+				}

+				Diagram diagram = ViewService.createDiagram(diagramRootElementSelectionPage.getModelElement(), CompositeStructureDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);

+				diagramResource.getContents().add(diagram);

+				new UMLDiagramContentInitializer().initDiagramContent(diagram);

+				return CommandResult.newOKCommandResult();

+			}

+		};

+		try {

+			OperationHistoryFactory.getOperationHistory().execute(command, new NullProgressMonitor(), null);

+			diagramResource.save(UMLDiagramEditorUtil.getSaveOptions());

+			UMLDiagramEditorUtil.openDiagram(diagramResource);

+		} catch (ExecutionException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Unable to create model and diagram", e); //$NON-NLS-1$

+		} catch (IOException ex) {

+			UMLDiagramEditorPlugin.getInstance().logError("Save operation failed for: " + diagramModelURI, ex); //$NON-NLS-1$

+		} catch (PartInitException ex) {

+			UMLDiagramEditorPlugin.getInstance().logError("Unable to open editor", ex); //$NON-NLS-1$

+		}

+		return true;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static class DiagramRootElementSelectionPage extends ModelElementSelectionPage {

+

+		/**

+		 * @generated

+		 */

+		protected DiagramRootElementSelectionPage(String pageName) {

+			super(pageName);

+		}

+

+		/**

+		 * @generated

+		 */

+		protected String getSelectionTitle() {

+			return Messages.UMLNewDiagramFileWizard_RootSelectionPageSelectionTitle;

+		}

+

+		/**

+		 * @generated

+		 */

+		protected boolean validatePage() {

+			if(getModelElement() == null) {

+				setErrorMessage(Messages.UMLNewDiagramFileWizard_RootSelectionPageNoSelectionMessage);

+				return false;

+			}

+			boolean result = ViewService.getInstance().provides(new CreateDiagramViewOperation(new EObjectAdapter(getModelElement()), CompositeStructureDiagramEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT));

+			setErrorMessage(result ? null : Messages.UMLNewDiagramFileWizard_RootSelectionPageInvalidSelectionMessage);

+			return result;

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLNodeDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLNodeDescriptor.java
index 5c46e9d7174..343d045df87 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLNodeDescriptor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLNodeDescriptor.java
@@ -1,27 +1,28 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.part;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.tooling.runtime.update.UpdaterNodeDescriptor;
-
-/**
- * @generated
- */
-public class UMLNodeDescriptor extends UpdaterNodeDescriptor {
-	/**
-	 * @generated
-	 */
-	public UMLNodeDescriptor(EObject modelElement, int visualID) {
-		super(modelElement, visualID);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.part;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.tooling.runtime.update.UpdaterNodeDescriptor;

+

+/**

+ * @generated

+ */

+public class UMLNodeDescriptor extends UpdaterNodeDescriptor {

+

+	/**

+	 * @generated

+	 */

+	public UMLNodeDescriptor(EObject modelElement, int visualID) {

+		super(modelElement, visualID);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLPaletteFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLPaletteFactory.java
index d5a42ebc3b8..948a2653ed6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLPaletteFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLPaletteFactory.java
@@ -1,560 +1,591 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.part;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.gef.Tool;
-import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeConnectionTool;
-import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeCreationTool;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-
-/**
- * @generated
- */
-public class UMLPaletteFactory extends PaletteFactory.Adapter {
-	//RS: New Palette generation
-	//Generates the ID for the tool elements
-	//Generate the tool factory (if(ID) createtool...)
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_CLASS = "composite.tool.class";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_PROPERTY = "composite.tool.property";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_PORT = "composite.tool.port";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_COLLABORATION = "composite.tool.collaboration";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_COLLABORATIONROLE = "composite.tool.collaborationrole";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_COLLABORATIONUSE = "composite.tool.collaborationuse";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_COMMENT = "composite.tool.comment";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_CONSTRAINT = "composite.tool.constraint";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_TIMEOBSERVATION = "composite.tool.timeobservation";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_DURATIONOBSERVATION = "composite.tool.durationobservation";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_INFORMATIONITEM = "composite.tool.informationitem";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_PARAMETER = "composite.tool.parameter";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_ACTIVITY = "composite.tool.activity";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_INTERACTION = "composite.tool.interaction";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_PROTOCOLSTATEMACHINE = "composite.tool.protocolstatemachine";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_STATEMACHINE = "composite.tool.statemachine";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_FUNCTIONBEHAVIOR = "composite.tool.functionbehavior";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_OPAQUEBEHAVIOR = "composite.tool.opaquebehavior";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_LINK = "composite.tool.link";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_CONNECTOR = "composite.tool.connector";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_ROLEBINDING = "composite.tool.rolebinding";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_GENERALIZATION = "composite.tool.generalization";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_REALIZATION = "composite.tool.realization";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_SUBSTITUTION = "composite.tool.substitution";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_ABSTRACTION = "composite.tool.abstraction";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_USAGE = "composite.tool.usage";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_DEPENDENCY = "composite.tool.dependency";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_REPRESENTATION = "composite.tool.representation";//$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	private final static String COMPOSITE_TOOL_INFORMATIONFLOW = "composite.tool.informationflow";//$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public UMLPaletteFactory() {
-	}
-
-	/**
-	 * @generated
-	 */
-	public Tool createTool(String toolId) {
-		if (toolId.equals(COMPOSITE_TOOL_CLASS)) {
-			return createClassCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_PROPERTY)) {
-			return createPropertyCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_PORT)) {
-			return createPortCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_COLLABORATION)) {
-			return createCollaborationCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_COLLABORATIONROLE)) {
-			return createCollaborationRoleCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_COLLABORATIONUSE)) {
-			return createCollaborationUseCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_COMMENT)) {
-			return createCommentCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_CONSTRAINT)) {
-			return createConstraintCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_TIMEOBSERVATION)) {
-			return createTimeObservationCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_DURATIONOBSERVATION)) {
-			return createDurationObservationCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_INFORMATIONITEM)) {
-			return createInformationItemCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_PARAMETER)) {
-			return createParameterCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_ACTIVITY)) {
-			return createActivityCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_INTERACTION)) {
-			return createInteractionCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_PROTOCOLSTATEMACHINE)) {
-			return createProtocolStateMachineCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_STATEMACHINE)) {
-			return createStateMachineCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_FUNCTIONBEHAVIOR)) {
-			return createFunctionBehaviorCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_OPAQUEBEHAVIOR)) {
-			return createOpaqueBehaviorCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_LINK)) {
-			return createLinkCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_CONNECTOR)) {
-			return createConnectorCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_ROLEBINDING)) {
-			return createRoleBindingCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_GENERALIZATION)) {
-			return createGeneralizationCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_REALIZATION)) {
-			return createRealizationCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_SUBSTITUTION)) {
-			return createSubstitutionCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_ABSTRACTION)) {
-			return createAbstractionCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_USAGE)) {
-			return createUsageCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_DEPENDENCY)) {
-			return createDependencyCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_REPRESENTATION)) {
-			return createRepresentationCreationTool();
-		}
-		if (toolId.equals(COMPOSITE_TOOL_INFORMATIONFLOW)) {
-			return createInformationFlowCreationTool();
-		}
-		// default return: null
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Object getTemplate(String templateId) {
-		// default return: null
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createClassCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(2);
-		types.add(UMLElementTypes.Class_2073);
-		types.add(UMLElementTypes.Class_3085);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createPropertyCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.Property_3070);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createPortCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.Port_3069);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createCollaborationCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(2);
-		types.add(UMLElementTypes.Collaboration_3086);
-		types.add(UMLElementTypes.Collaboration_2075);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createCollaborationRoleCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.ConnectableElement_3115);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createCollaborationUseCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.CollaborationUse_3071);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createCommentCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(2);
-		types.add(UMLElementTypes.Comment_3097);
-		types.add(UMLElementTypes.Comment_2109);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createConstraintCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(2);
-		types.add(UMLElementTypes.Constraint_2114);
-		types.add(UMLElementTypes.Constraint_3120);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createTimeObservationCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.TimeObservation_2094);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createDurationObservationCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.DurationObservation_2093);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createInformationItemCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(2);
-		types.add(UMLElementTypes.InformationItem_3094);
-		types.add(UMLElementTypes.InformationItem_2080);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createParameterCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.Parameter_3088);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createActivityCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(2);
-		types.add(UMLElementTypes.Activity_3072);
-		types.add(UMLElementTypes.Activity_2060);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createInteractionCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(2);
-		types.add(UMLElementTypes.Interaction_3073);
-		types.add(UMLElementTypes.Interaction_2061);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createProtocolStateMachineCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(2);
-		types.add(UMLElementTypes.ProtocolStateMachine_3074);
-		types.add(UMLElementTypes.ProtocolStateMachine_2062);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createStateMachineCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(2);
-		types.add(UMLElementTypes.StateMachine_3075);
-		types.add(UMLElementTypes.StateMachine_2063);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createFunctionBehaviorCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(2);
-		types.add(UMLElementTypes.FunctionBehavior_3076);
-		types.add(UMLElementTypes.FunctionBehavior_2064);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createOpaqueBehaviorCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(2);
-		types.add(UMLElementTypes.OpaqueBehavior_3077);
-		types.add(UMLElementTypes.OpaqueBehavior_2065);
-		Tool tool = new AspectUnspecifiedTypeCreationTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createLinkCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(4);
-		types.add(UMLElementTypes.CommentAnnotatedElement_4002);
-		types.add(UMLElementTypes.ConstraintConstrainedElement_4003);
-		types.add(UMLElementTypes.TimeObservationEvent_4018);
-		types.add(UMLElementTypes.DurationObservationEvent_4019);
-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createConnectorCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.Connector_4013);
-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createRoleBindingCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.Dependency_4017);
-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createGeneralizationCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.Generalization_4015);
-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createRealizationCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.Realization_4006);
-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createSubstitutionCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.Substitution_4011);
-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createAbstractionCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.Abstraction_4007);
-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createUsageCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.Usage_4008);
-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createDependencyCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.Dependency_4010);
-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createRepresentationCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.InformationItemRepresented_4020);
-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
-		return tool;
-	}
-
-	/**
-	 * @generated
-	 */
-	private Tool createInformationFlowCreationTool() {
-		List<IElementType> types = new ArrayList<IElementType>(1);
-		types.add(UMLElementTypes.InformationFlow_4021);
-		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);
-		return tool;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.part;

+

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.gef.Tool;

+import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeConnectionTool;

+import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeCreationTool;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+

+/**

+ * @generated

+ */

+public class UMLPaletteFactory extends PaletteFactory.Adapter {

+

+	//RS: New Palette generation

+	//Generates the ID for the tool elements

+	//Generate the tool factory (if(ID) createtool...)

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_CLASS = "composite.tool.class";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_PROPERTY = "composite.tool.property";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_PORT = "composite.tool.port";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_COLLABORATION = "composite.tool.collaboration";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_COLLABORATIONROLE = "composite.tool.collaborationrole";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_COLLABORATIONUSE = "composite.tool.collaborationuse";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_COMMENT = "composite.tool.comment";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_CONSTRAINT = "composite.tool.constraint";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_TIMEOBSERVATION = "composite.tool.timeobservation";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_DURATIONOBSERVATION = "composite.tool.durationobservation";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_INFORMATIONITEM = "composite.tool.informationitem";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_PARAMETER = "composite.tool.parameter";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_ACTIVITY = "composite.tool.activity";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_INTERACTION = "composite.tool.interaction";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_PROTOCOLSTATEMACHINE = "composite.tool.protocolstatemachine";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_STATEMACHINE = "composite.tool.statemachine";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_FUNCTIONBEHAVIOR = "composite.tool.functionbehavior";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_OPAQUEBEHAVIOR = "composite.tool.opaquebehavior";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_LINK = "composite.tool.link";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_CONNECTOR = "composite.tool.connector";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_ROLEBINDING = "composite.tool.rolebinding";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_GENERALIZATION = "composite.tool.generalization";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_REALIZATION = "composite.tool.realization";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_SUBSTITUTION = "composite.tool.substitution";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_ABSTRACTION = "composite.tool.abstraction";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_USAGE = "composite.tool.usage";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_DEPENDENCY = "composite.tool.dependency";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_REPRESENTATION = "composite.tool.representation";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	private final static String COMPOSITE_TOOL_INFORMATIONFLOW = "composite.tool.informationflow";//$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public UMLPaletteFactory() {

+

+	}

+

+	/**

+	 * @generated

+	 */

+	public Tool createTool(String toolId) {

+		if(toolId.equals(COMPOSITE_TOOL_CLASS)) {

+			return createClassCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_PROPERTY)) {

+			return createPropertyCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_PORT)) {

+			return createPortCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_COLLABORATION)) {

+			return createCollaborationCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_COLLABORATIONROLE)) {

+			return createCollaborationRoleCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_COLLABORATIONUSE)) {

+			return createCollaborationUseCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_COMMENT)) {

+			return createCommentCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_CONSTRAINT)) {

+			return createConstraintCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_TIMEOBSERVATION)) {

+			return createTimeObservationCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_DURATIONOBSERVATION)) {

+			return createDurationObservationCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_INFORMATIONITEM)) {

+			return createInformationItemCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_PARAMETER)) {

+			return createParameterCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_ACTIVITY)) {

+			return createActivityCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_INTERACTION)) {

+			return createInteractionCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_PROTOCOLSTATEMACHINE)) {

+			return createProtocolStateMachineCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_STATEMACHINE)) {

+			return createStateMachineCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_FUNCTIONBEHAVIOR)) {

+			return createFunctionBehaviorCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_OPAQUEBEHAVIOR)) {

+			return createOpaqueBehaviorCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_LINK)) {

+			return createLinkCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_CONNECTOR)) {

+			return createConnectorCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_ROLEBINDING)) {

+			return createRoleBindingCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_GENERALIZATION)) {

+			return createGeneralizationCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_REALIZATION)) {

+			return createRealizationCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_SUBSTITUTION)) {

+			return createSubstitutionCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_ABSTRACTION)) {

+			return createAbstractionCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_USAGE)) {

+			return createUsageCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_DEPENDENCY)) {

+			return createDependencyCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_REPRESENTATION)) {

+			return createRepresentationCreationTool();

+		}

+		if(toolId.equals(COMPOSITE_TOOL_INFORMATIONFLOW)) {

+			return createInformationFlowCreationTool();

+		}

+		// default return: null

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Object getTemplate(String templateId) {

+

+		// default return: null

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createClassCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(UMLElementTypes.Class_2073);

+		types.add(UMLElementTypes.Class_3085);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createPropertyCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.Property_3070);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createPortCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.Port_3069);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createCollaborationCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(UMLElementTypes.Collaboration_3086);

+		types.add(UMLElementTypes.Collaboration_2075);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createCollaborationRoleCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.ConnectableElement_3115);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createCollaborationUseCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.CollaborationUse_3071);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createCommentCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(UMLElementTypes.Comment_3097);

+		types.add(UMLElementTypes.Comment_2109);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createConstraintCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(UMLElementTypes.Constraint_2114);

+		types.add(UMLElementTypes.Constraint_3120);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createTimeObservationCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.TimeObservation_2094);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createDurationObservationCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.DurationObservation_2093);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createInformationItemCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(UMLElementTypes.InformationItem_3094);

+		types.add(UMLElementTypes.InformationItem_2080);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createParameterCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.Parameter_3088);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createActivityCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(UMLElementTypes.Activity_3072);

+		types.add(UMLElementTypes.Activity_2060);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createInteractionCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(UMLElementTypes.Interaction_3073);

+		types.add(UMLElementTypes.Interaction_2061);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createProtocolStateMachineCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(UMLElementTypes.ProtocolStateMachine_3074);

+		types.add(UMLElementTypes.ProtocolStateMachine_2062);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createStateMachineCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(UMLElementTypes.StateMachine_3075);

+		types.add(UMLElementTypes.StateMachine_2063);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createFunctionBehaviorCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(UMLElementTypes.FunctionBehavior_3076);

+		types.add(UMLElementTypes.FunctionBehavior_2064);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createOpaqueBehaviorCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(2);

+		types.add(UMLElementTypes.OpaqueBehavior_3077);

+		types.add(UMLElementTypes.OpaqueBehavior_2065);

+		Tool tool = new AspectUnspecifiedTypeCreationTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createLinkCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(4);

+		types.add(UMLElementTypes.CommentAnnotatedElement_4002);

+		types.add(UMLElementTypes.ConstraintConstrainedElement_4003);

+		types.add(UMLElementTypes.TimeObservationEvent_4018);

+		types.add(UMLElementTypes.DurationObservationEvent_4019);

+		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createConnectorCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.Connector_4013);

+		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createRoleBindingCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.Dependency_4017);

+		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createGeneralizationCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.Generalization_4015);

+		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createRealizationCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.Realization_4006);

+		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createSubstitutionCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.Substitution_4011);

+		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createAbstractionCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.Abstraction_4007);

+		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createUsageCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.Usage_4008);

+		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createDependencyCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.Dependency_4010);

+		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createRepresentationCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.InformationItemRepresented_4020);

+		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

+		return tool;

+	}

+

+	/**

+	 * @generated

+	 */

+	private Tool createInformationFlowCreationTool() {

+		List<IElementType> types = new ArrayList<IElementType>(1);

+		types.add(UMLElementTypes.InformationFlow_4021);

+		Tool tool = new AspectUnspecifiedTypeConnectionTool(types);

+		return tool;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLVisualIDRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLVisualIDRegistry.java
index e8158f73326..8e92a5d06cf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLVisualIDRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLVisualIDRegistry.java
@@ -1,5977 +1,5980 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.part;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.tooling.runtime.structure.DiagramStructure;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.*;
-import org.eclipse.uml2.uml.Collaboration;
-import org.eclipse.uml2.uml.CollaborationUse;
-import org.eclipse.uml2.uml.Dependency;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * This registry is used to determine which type of visual object should be
- * created for the corresponding Diagram, Node, ChildNode or Link represented
- * by a domain model object.
- * 
- * @generated
- */
-public class UMLVisualIDRegistry {
-	/**
-	 * @generated
-	 */
-	private static final String DEBUG_KEY = "org.eclipse.papyrus.uml.diagram.composite/debug/visualID"; //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static int getVisualID(View view) {
-		if (view instanceof Diagram) {
-			if (CompositeStructureDiagramEditPart.MODEL_ID.equals(view.getType())) {
-				return CompositeStructureDiagramEditPart.VISUAL_ID;
-			} else {
-				return -1;
-			}
-		}
-		return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getVisualID(view.getType());
-	}
-
-	/**
-	 * @generated
-	 */
-	public static String getModelID(View view) {
-		View diagram = view.getDiagram();
-		while (view != diagram) {
-			EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$
-			if (annotation != null) {
-				return (String) annotation.getDetails().get("modelID"); //$NON-NLS-1$
-			}
-			view = (View) view.eContainer();
-		}
-		return diagram != null ? diagram.getType() : null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static int getVisualID(String type) {
-		try {
-			return Integer.parseInt(type);
-		} catch (NumberFormatException e) {
-			if (Boolean.TRUE.toString().equalsIgnoreCase(Platform.getDebugOption(DEBUG_KEY))) {
-				UMLDiagramEditorPlugin.getInstance().logError("Unable to parse view type as a visualID number: " + type);
-			}
-		}
-		return -1;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static String getType(int visualID) {
-		return Integer.toString(visualID);
-	}
-
-	/**
-	 * @generated
-	 */
-	public static int getDiagramVisualID(EObject domainElement) {
-		if (domainElement == null) {
-			return -1;
-		}
-		return 1000;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static int getNodeVisualID(View containerView, EObject domainElement) {
-		if (domainElement == null) {
-			return -1;
-		}
-		String containerModelID = org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getModelID(containerView);
-		if (!CompositeStructureDiagramEditPart.MODEL_ID.equals(containerModelID)) {
-			return -1;
-		}
-		int containerVisualID;
-		if (CompositeStructureDiagramEditPart.MODEL_ID.equals(containerModelID)) {
-			containerVisualID = org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getVisualID(containerView);
-		} else {
-			if (containerView instanceof Diagram) {
-				containerVisualID = CompositeStructureDiagramEditPart.VISUAL_ID;
-			} else {
-				return -1;
-			}
-		}
-		switch (containerVisualID) {
-		case CompositeStructureDiagramEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {
-				return ActivityCompositeEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionCompositeEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return ProtocolStateMachineCompositeEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return StateMachineCompositeEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return FunctionBehaviorCompositeEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return OpaqueBehaviorCompositeEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
-				return ComponentCompositeEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
-				return DeviceCompositeEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
-				return ExecutionEnvironmentCompositeEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {
-				return NodeCompositeEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
-				return ClassCompositeEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationCompositeEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {
-				return InterfaceEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {
-				return PrimitiveTypeEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {
-				return EnumerationEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {
-				return DataTypeEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {
-				return ActorEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {
-				return DeploymentSpecificationEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {
-				return ArtifactEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {
-				return InformationItemEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {
-				return SignalEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {
-				return UseCaseEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getSignalEvent().isSuperTypeOf(domainElement.eClass())) {
-				return SignalEventEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCallEvent().isSuperTypeOf(domainElement.eClass())) {
-				return CallEventEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getAnyReceiveEvent().isSuperTypeOf(domainElement.eClass())) {
-				return AnyReceiveEventEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getChangeEvent().isSuperTypeOf(domainElement.eClass())) {
-				return ChangeEventEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeEvent().isSuperTypeOf(domainElement.eClass())) {
-				return TimeEventEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDurationObservation().isSuperTypeOf(domainElement.eClass())) {
-				return DurationObservationEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeObservation().isSuperTypeOf(domainElement.eClass())) {
-				return TimeObservationEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getLiteralBoolean().isSuperTypeOf(domainElement.eClass())) {
-				return LiteralBooleanEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getLiteralInteger().isSuperTypeOf(domainElement.eClass())) {
-				return LiteralIntegerEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getLiteralNull().isSuperTypeOf(domainElement.eClass())) {
-				return LiteralNullEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getLiteralString().isSuperTypeOf(domainElement.eClass())) {
-				return LiteralStringEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getLiteralUnlimitedNatural().isSuperTypeOf(domainElement.eClass())) {
-				return LiteralUnlimitedNaturalEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getStringExpression().isSuperTypeOf(domainElement.eClass())) {
-				return StringExpressionEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getOpaqueExpression().isSuperTypeOf(domainElement.eClass())) {
-				return OpaqueExpressionEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeExpression().isSuperTypeOf(domainElement.eClass())) {
-				return TimeExpressionEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getExpression().isSuperTypeOf(domainElement.eClass())) {
-				return ExpressionEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDuration().isSuperTypeOf(domainElement.eClass())) {
-				return DurationEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeInterval().isSuperTypeOf(domainElement.eClass())) {
-				return TimeIntervalEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDurationInterval().isSuperTypeOf(domainElement.eClass())) {
-				return DurationIntervalEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInterval().isSuperTypeOf(domainElement.eClass())) {
-				return IntervalEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInstanceValue().isSuperTypeOf(domainElement.eClass())) {
-				return InstanceValueEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return DurationConstraintEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return TimeConstraintEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return IntervalConstraintEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionConstraintEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return ConstraintEditPart.VISUAL_ID;
-			}
-			break;
-		case ActivityCompositeEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {
-				return PortEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {
-				return ParameterEditPart.VISUAL_ID;
-			}
-			break;
-		case InteractionCompositeEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {
-				return PortEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {
-				return ParameterEditPart.VISUAL_ID;
-			}
-			break;
-		case ProtocolStateMachineCompositeEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {
-				return PortEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {
-				return ParameterEditPart.VISUAL_ID;
-			}
-			break;
-		case StateMachineCompositeEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {
-				return PortEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {
-				return ParameterEditPart.VISUAL_ID;
-			}
-			break;
-		case FunctionBehaviorCompositeEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {
-				return PortEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {
-				return ParameterEditPart.VISUAL_ID;
-			}
-			break;
-		case OpaqueBehaviorCompositeEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {
-				return PortEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {
-				return ParameterEditPart.VISUAL_ID;
-			}
-			break;
-		case ComponentCompositeEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {
-				return PortEditPart.VISUAL_ID;
-			}
-			break;
-		case DeviceCompositeEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {
-				return PortEditPart.VISUAL_ID;
-			}
-			break;
-		case ExecutionEnvironmentCompositeEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {
-				return PortEditPart.VISUAL_ID;
-			}
-			break;
-		case NodeCompositeEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {
-				return PortEditPart.VISUAL_ID;
-			}
-			break;
-		case ClassCompositeEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {
-				return PortEditPart.VISUAL_ID;
-			}
-			break;
-		case EnumerationEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getEnumerationLiteral().isSuperTypeOf(domainElement.eClass())) {
-				return EnumerationLiteralEditPartCLN.VISUAL_ID;
-			}
-			break;
-		case PropertyPartEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {
-				return PortEditPart.VISUAL_ID;
-			}
-			break;
-		case ActivityCompositeEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {
-				return PortEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {
-				return ParameterEditPart.VISUAL_ID;
-			}
-			break;
-		case InteractionCompositeEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {
-				return PortEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {
-				return ParameterEditPart.VISUAL_ID;
-			}
-			break;
-		case ProtocolStateMachineCompositeEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {
-				return PortEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {
-				return ParameterEditPart.VISUAL_ID;
-			}
-			break;
-		case StateMachineCompositeEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {
-				return PortEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {
-				return ParameterEditPart.VISUAL_ID;
-			}
-			break;
-		case FunctionBehaviorCompositeEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {
-				return PortEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {
-				return ParameterEditPart.VISUAL_ID;
-			}
-			break;
-		case OpaqueBehaviorCompositeEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {
-				return PortEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {
-				return ParameterEditPart.VISUAL_ID;
-			}
-			break;
-		case ComponentCompositeEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {
-				return PortEditPart.VISUAL_ID;
-			}
-			break;
-		case DeviceCompositeEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {
-				return PortEditPart.VISUAL_ID;
-			}
-			break;
-		case ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {
-				return PortEditPart.VISUAL_ID;
-			}
-			break;
-		case NodeCompositeEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {
-				return PortEditPart.VISUAL_ID;
-			}
-			break;
-		case ClassCompositeEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {
-				return PortEditPart.VISUAL_ID;
-			}
-			break;
-		case EnumerationEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getEnumerationLiteral().isSuperTypeOf(domainElement.eClass())) {
-				return EnumerationLiteralEditPartCLN.VISUAL_ID;
-			}
-			break;
-		case DataTypeAttributeCompartmentEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {
-				return PropertyEditPartCLN.VISUAL_ID;
-			}
-			break;
-		case DataTypeOperationCompartmentEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) {
-				return OperationEditPartCLN.VISUAL_ID;
-			}
-			break;
-		case DataTypeAttributeCompartmentEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {
-				return PropertyEditPartCLN.VISUAL_ID;
-			}
-			break;
-		case DataTypeOperationCompartmentEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) {
-				return OperationEditPartCLN.VISUAL_ID;
-			}
-			break;
-		case EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getEnumerationLiteral().isSuperTypeOf(domainElement.eClass())) {
-				return EnumerationLiteralEditPartCLN.VISUAL_ID;
-			}
-			break;
-		case EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getEnumerationLiteral().isSuperTypeOf(domainElement.eClass())) {
-				return EnumerationLiteralEditPartCLN.VISUAL_ID;
-			}
-			break;
-		case ActivityCompositeCompartmentEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {
-				return ParameterEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {
-				return PropertyPartEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationUseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {
-				return ActivityCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return StateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
-				return ComponentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
-				return DeviceCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
-				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {
-				return NodeCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
-				return ClassCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {
-				return InterfaceEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {
-				return PrimitiveTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {
-				return EnumerationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {
-				return DataTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {
-				return ActorEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {
-				return DeploymentSpecificationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {
-				return ArtifactEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {
-				return InformationItemEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {
-				return SignalEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {
-				return UseCaseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return DurationConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return TimeConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return IntervalConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return ConstraintEditPartCN.VISUAL_ID;
-			}
-			break;
-		case InteractionCompositeCompartmentEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {
-				return ParameterEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {
-				return PropertyPartEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationUseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {
-				return ActivityCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return StateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
-				return ComponentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
-				return DeviceCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
-				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {
-				return NodeCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
-				return ClassCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {
-				return InterfaceEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {
-				return PrimitiveTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {
-				return EnumerationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {
-				return DataTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {
-				return ActorEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {
-				return DeploymentSpecificationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {
-				return ArtifactEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {
-				return InformationItemEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {
-				return SignalEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {
-				return UseCaseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return DurationConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return TimeConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return IntervalConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return ConstraintEditPartCN.VISUAL_ID;
-			}
-			break;
-		case ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {
-				return ParameterEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {
-				return PropertyPartEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationUseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {
-				return ActivityCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return StateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
-				return ComponentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
-				return DeviceCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
-				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {
-				return NodeCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
-				return ClassCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {
-				return InterfaceEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {
-				return PrimitiveTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {
-				return EnumerationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {
-				return DataTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {
-				return ActorEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {
-				return DeploymentSpecificationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {
-				return ArtifactEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {
-				return InformationItemEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {
-				return SignalEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {
-				return UseCaseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return DurationConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return TimeConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return IntervalConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return ConstraintEditPartCN.VISUAL_ID;
-			}
-			break;
-		case StateMachineCompositeCompartmentEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {
-				return ParameterEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {
-				return PropertyPartEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationUseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {
-				return ActivityCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return StateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
-				return ComponentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
-				return DeviceCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
-				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {
-				return NodeCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
-				return ClassCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {
-				return InterfaceEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {
-				return PrimitiveTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {
-				return EnumerationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {
-				return DataTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {
-				return ActorEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {
-				return DeploymentSpecificationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {
-				return ArtifactEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {
-				return InformationItemEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {
-				return SignalEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {
-				return UseCaseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return DurationConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return TimeConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return IntervalConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return ConstraintEditPartCN.VISUAL_ID;
-			}
-			break;
-		case FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {
-				return ParameterEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {
-				return PropertyPartEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationUseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {
-				return ActivityCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return StateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
-				return ComponentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
-				return DeviceCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
-				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {
-				return NodeCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
-				return ClassCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {
-				return InterfaceEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {
-				return PrimitiveTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {
-				return EnumerationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {
-				return DataTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {
-				return ActorEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {
-				return DeploymentSpecificationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {
-				return ArtifactEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {
-				return InformationItemEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {
-				return SignalEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {
-				return UseCaseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return DurationConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return TimeConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return IntervalConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return ConstraintEditPartCN.VISUAL_ID;
-			}
-			break;
-		case OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {
-				return ParameterEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {
-				return PropertyPartEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationUseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {
-				return ActivityCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return StateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
-				return ComponentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
-				return DeviceCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
-				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {
-				return NodeCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
-				return ClassCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {
-				return InterfaceEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {
-				return PrimitiveTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {
-				return EnumerationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {
-				return DataTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {
-				return ActorEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {
-				return DeploymentSpecificationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {
-				return ArtifactEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {
-				return InformationItemEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {
-				return SignalEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {
-				return UseCaseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return DurationConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return TimeConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return IntervalConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return ConstraintEditPartCN.VISUAL_ID;
-			}
-			break;
-		case ComponentCompositeCompartmentEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {
-				return PropertyPartEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationUseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {
-				return ActivityCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return StateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
-				return ComponentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
-				return DeviceCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
-				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {
-				return NodeCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
-				return ClassCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {
-				return InterfaceEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {
-				return PrimitiveTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {
-				return EnumerationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {
-				return DataTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {
-				return ActorEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {
-				return DeploymentSpecificationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {
-				return ArtifactEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {
-				return InformationItemEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {
-				return SignalEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {
-				return UseCaseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return DurationConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return TimeConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return IntervalConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return ConstraintEditPartCN.VISUAL_ID;
-			}
-			break;
-		case DeviceCompositeCompartmentEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {
-				return PropertyPartEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationUseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {
-				return ActivityCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return StateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
-				return ComponentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
-				return DeviceCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
-				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {
-				return NodeCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
-				return ClassCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {
-				return InterfaceEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {
-				return PrimitiveTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {
-				return EnumerationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {
-				return DataTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {
-				return ActorEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {
-				return DeploymentSpecificationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {
-				return ArtifactEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {
-				return InformationItemEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {
-				return SignalEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {
-				return UseCaseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return DurationConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return TimeConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return IntervalConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return ConstraintEditPartCN.VISUAL_ID;
-			}
-			break;
-		case ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {
-				return PropertyPartEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationUseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {
-				return ActivityCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return StateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
-				return ComponentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
-				return DeviceCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
-				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {
-				return NodeCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
-				return ClassCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {
-				return InterfaceEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {
-				return PrimitiveTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {
-				return EnumerationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {
-				return DataTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {
-				return ActorEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {
-				return DeploymentSpecificationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {
-				return ArtifactEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {
-				return InformationItemEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {
-				return SignalEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {
-				return UseCaseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return DurationConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return TimeConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return IntervalConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return ConstraintEditPartCN.VISUAL_ID;
-			}
-			break;
-		case NodeCompositeCompartmentEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {
-				return PropertyPartEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationUseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {
-				return ActivityCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return StateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
-				return ComponentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
-				return DeviceCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
-				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {
-				return NodeCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
-				return ClassCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {
-				return InterfaceEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {
-				return PrimitiveTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {
-				return EnumerationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {
-				return DataTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {
-				return ActorEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {
-				return DeploymentSpecificationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {
-				return ArtifactEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {
-				return InformationItemEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {
-				return SignalEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {
-				return UseCaseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return DurationConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return TimeConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return IntervalConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return ConstraintEditPartCN.VISUAL_ID;
-			}
-			break;
-		case ClassCompositeCompartmentEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {
-				return PropertyPartEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationUseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {
-				return ActivityCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return StateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
-				return ComponentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
-				return DeviceCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
-				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {
-				return NodeCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
-				return ClassCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {
-				return InterfaceEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {
-				return PrimitiveTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {
-				return EnumerationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {
-				return DataTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {
-				return ActorEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {
-				return DeploymentSpecificationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {
-				return ArtifactEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {
-				return InformationItemEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {
-				return SignalEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {
-				return UseCaseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return DurationConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return TimeConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return IntervalConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return ConstraintEditPartCN.VISUAL_ID;
-			}
-			break;
-		case CollaborationCompositeCompartmentEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {
-				return PropertyPartEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationUseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getConnectableElement().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationRoleEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return DurationConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return TimeConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return IntervalConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return ConstraintEditPartCN.VISUAL_ID;
-			}
-			break;
-		case ActivityCompositeCompartmentEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {
-				return ParameterEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {
-				return PropertyPartEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationUseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {
-				return ActivityCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return StateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
-				return ComponentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
-				return DeviceCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
-				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {
-				return NodeCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
-				return ClassCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {
-				return InterfaceEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {
-				return PrimitiveTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {
-				return EnumerationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {
-				return DataTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {
-				return ActorEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {
-				return DeploymentSpecificationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {
-				return ArtifactEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {
-				return InformationItemEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {
-				return SignalEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {
-				return UseCaseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return DurationConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return TimeConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return IntervalConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return ConstraintEditPartCN.VISUAL_ID;
-			}
-			break;
-		case InteractionCompositeCompartmentEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {
-				return ParameterEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {
-				return PropertyPartEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationUseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {
-				return ActivityCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return StateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
-				return ComponentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
-				return DeviceCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
-				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {
-				return NodeCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
-				return ClassCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {
-				return InterfaceEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {
-				return PrimitiveTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {
-				return EnumerationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {
-				return DataTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {
-				return ActorEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {
-				return DeploymentSpecificationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {
-				return ArtifactEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {
-				return InformationItemEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {
-				return SignalEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {
-				return UseCaseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return DurationConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return TimeConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return IntervalConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return ConstraintEditPartCN.VISUAL_ID;
-			}
-			break;
-		case ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {
-				return ParameterEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {
-				return PropertyPartEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationUseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {
-				return ActivityCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return StateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
-				return ComponentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
-				return DeviceCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
-				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {
-				return NodeCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
-				return ClassCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {
-				return InterfaceEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {
-				return PrimitiveTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {
-				return EnumerationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {
-				return DataTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {
-				return ActorEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {
-				return DeploymentSpecificationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {
-				return ArtifactEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {
-				return InformationItemEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {
-				return SignalEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {
-				return UseCaseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return DurationConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return TimeConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return IntervalConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return ConstraintEditPartCN.VISUAL_ID;
-			}
-			break;
-		case StateMachineCompositeCompartmentEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {
-				return ParameterEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {
-				return PropertyPartEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationUseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {
-				return ActivityCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return StateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
-				return ComponentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
-				return DeviceCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
-				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {
-				return NodeCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
-				return ClassCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {
-				return InterfaceEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {
-				return PrimitiveTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {
-				return EnumerationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {
-				return DataTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {
-				return ActorEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {
-				return DeploymentSpecificationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {
-				return ArtifactEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {
-				return InformationItemEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {
-				return SignalEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {
-				return UseCaseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return DurationConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return TimeConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return IntervalConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return ConstraintEditPartCN.VISUAL_ID;
-			}
-			break;
-		case FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {
-				return ParameterEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {
-				return PropertyPartEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationUseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {
-				return ActivityCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return StateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
-				return ComponentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
-				return DeviceCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
-				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {
-				return NodeCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
-				return ClassCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {
-				return InterfaceEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {
-				return PrimitiveTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {
-				return EnumerationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {
-				return DataTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {
-				return ActorEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {
-				return DeploymentSpecificationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {
-				return ArtifactEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {
-				return InformationItemEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {
-				return SignalEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {
-				return UseCaseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return DurationConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return TimeConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return IntervalConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return ConstraintEditPartCN.VISUAL_ID;
-			}
-			break;
-		case OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {
-				return ParameterEditPart.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {
-				return PropertyPartEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationUseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {
-				return ActivityCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return StateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
-				return ComponentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
-				return DeviceCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
-				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {
-				return NodeCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
-				return ClassCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {
-				return InterfaceEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {
-				return PrimitiveTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {
-				return EnumerationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {
-				return DataTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {
-				return ActorEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {
-				return DeploymentSpecificationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {
-				return ArtifactEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {
-				return InformationItemEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {
-				return SignalEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {
-				return UseCaseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return DurationConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return TimeConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return IntervalConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return ConstraintEditPartCN.VISUAL_ID;
-			}
-			break;
-		case ComponentCompositeCompartmentEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {
-				return PropertyPartEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationUseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {
-				return ActivityCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return StateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
-				return ComponentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
-				return DeviceCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
-				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {
-				return NodeCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
-				return ClassCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {
-				return InterfaceEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {
-				return PrimitiveTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {
-				return EnumerationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {
-				return DataTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {
-				return ActorEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {
-				return DeploymentSpecificationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {
-				return ArtifactEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {
-				return InformationItemEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {
-				return SignalEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {
-				return UseCaseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return DurationConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return TimeConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return IntervalConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return ConstraintEditPartCN.VISUAL_ID;
-			}
-			break;
-		case DeviceCompositeCompartmentEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {
-				return PropertyPartEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationUseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {
-				return ActivityCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return StateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
-				return ComponentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
-				return DeviceCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
-				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {
-				return NodeCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
-				return ClassCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {
-				return InterfaceEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {
-				return PrimitiveTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {
-				return EnumerationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {
-				return DataTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {
-				return ActorEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {
-				return DeploymentSpecificationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {
-				return ArtifactEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {
-				return InformationItemEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {
-				return SignalEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {
-				return UseCaseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return DurationConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return TimeConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return IntervalConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return ConstraintEditPartCN.VISUAL_ID;
-			}
-			break;
-		case ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {
-				return PropertyPartEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationUseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {
-				return ActivityCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return StateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
-				return ComponentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
-				return DeviceCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
-				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {
-				return NodeCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
-				return ClassCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {
-				return InterfaceEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {
-				return PrimitiveTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {
-				return EnumerationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {
-				return DataTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {
-				return ActorEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {
-				return DeploymentSpecificationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {
-				return ArtifactEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {
-				return InformationItemEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {
-				return SignalEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {
-				return UseCaseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return DurationConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return TimeConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return IntervalConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return ConstraintEditPartCN.VISUAL_ID;
-			}
-			break;
-		case NodeCompositeCompartmentEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {
-				return PropertyPartEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationUseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {
-				return ActivityCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return StateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
-				return ComponentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
-				return DeviceCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
-				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {
-				return NodeCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
-				return ClassCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {
-				return InterfaceEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {
-				return PrimitiveTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {
-				return EnumerationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {
-				return DataTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {
-				return ActorEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {
-				return DeploymentSpecificationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {
-				return ArtifactEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {
-				return InformationItemEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {
-				return SignalEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {
-				return UseCaseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return DurationConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return TimeConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return IntervalConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return ConstraintEditPartCN.VISUAL_ID;
-			}
-			break;
-		case ClassCompositeCompartmentEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {
-				return PropertyPartEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationUseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {
-				return ActivityCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {
-				return StateMachineCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {
-				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {
-				return ComponentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
-				return DeviceCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
-				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {
-				return NodeCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {
-				return ClassCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationCompositeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {
-				return InterfaceEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {
-				return PrimitiveTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {
-				return EnumerationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {
-				return DataTypeEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {
-				return ActorEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {
-				return DeploymentSpecificationEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {
-				return ArtifactEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {
-				return InformationItemEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {
-				return SignalEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {
-				return UseCaseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return ConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return DurationConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return TimeConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return IntervalConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionConstraintEditPartCN.VISUAL_ID;
-			}
-			break;
-		case CollaborationCompositeCompartmentEditPart.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {
-				return PropertyPartEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationUseEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getConnectableElement().isSuperTypeOf(domainElement.eClass())) {
-				return CollaborationRoleEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return DurationConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return TimeConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return IntervalConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return InteractionConstraintEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {
-				return ConstraintEditPartCN.VISUAL_ID;
-			}
-			break;
-		case PropertyPartCompartmentEditPartCN.VISUAL_ID:
-			if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property) domainElement)) {
-				return PropertyPartEditPartCN.VISUAL_ID;
-			}
-			if (UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {
-				return CommentEditPartCN.VISUAL_ID;
-			}
-			break;
-		}
-		return -1;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static boolean canCreateNode(View containerView, int nodeVisualID) {
-		String containerModelID = org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getModelID(containerView);
-		if (!CompositeStructureDiagramEditPart.MODEL_ID.equals(containerModelID)) {
-			return false;
-		}
-		int containerVisualID;
-		if (CompositeStructureDiagramEditPart.MODEL_ID.equals(containerModelID)) {
-			containerVisualID = org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getVisualID(containerView);
-		} else {
-			if (containerView instanceof Diagram) {
-				containerVisualID = CompositeStructureDiagramEditPart.VISUAL_ID;
-			} else {
-				return false;
-			}
-		}
-		switch (containerVisualID) {
-		case CompositeStructureDiagramEditPart.VISUAL_ID:
-			if (ActivityCompositeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionCompositeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ProtocolStateMachineCompositeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (StateMachineCompositeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (FunctionBehaviorCompositeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (OpaqueBehaviorCompositeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ComponentCompositeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeviceCompositeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ExecutionEnvironmentCompositeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (NodeCompositeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ClassCompositeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationCompositeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InterfaceEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PrimitiveTypeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (EnumerationEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DataTypeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActorEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeploymentSpecificationEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ArtifactEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InformationItemEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (SignalEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (UseCaseEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (SignalEventEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CallEventEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (AnyReceiveEventEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ChangeEventEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeEventEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationObservationEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeObservationEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (LiteralBooleanEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (LiteralIntegerEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (LiteralNullEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (LiteralStringEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (LiteralUnlimitedNaturalEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (StringExpressionEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (OpaqueExpressionEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeExpressionEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ExpressionEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeIntervalEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationIntervalEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InstanceValueEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CommentEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationConstraintEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeConstraintEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalConstraintEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionConstraintEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConstraintEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ActivityCompositeEditPart.VISUAL_ID:
-			if (ActivityCompositeNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActivityCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PortEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case InteractionCompositeEditPart.VISUAL_ID:
-			if (InteractionCompositeNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PortEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ProtocolStateMachineCompositeEditPart.VISUAL_ID:
-			if (ProtocolStateMachineCompositeNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PortEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case StateMachineCompositeEditPart.VISUAL_ID:
-			if (StateMachineCompositeNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (StateMachineCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PortEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case FunctionBehaviorCompositeEditPart.VISUAL_ID:
-			if (FunctionBehaviorCompositeNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PortEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case OpaqueBehaviorCompositeEditPart.VISUAL_ID:
-			if (OpaqueBehaviorCompositeNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PortEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ComponentCompositeEditPart.VISUAL_ID:
-			if (ComponentCompositeNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ComponentCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PortEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case DeviceCompositeEditPart.VISUAL_ID:
-			if (DeviceCompositeNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeviceCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PortEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ExecutionEnvironmentCompositeEditPart.VISUAL_ID:
-			if (ExecutionEnvironmentCompositeNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PortEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case NodeCompositeEditPart.VISUAL_ID:
-			if (NodeCompositeNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (NodeCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PortEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ClassCompositeEditPart.VISUAL_ID:
-			if (ClassCompositeNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ClassCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PortEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case CollaborationCompositeEditPart.VISUAL_ID:
-			if (CollaborationCompositeNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case InterfaceEditPart.VISUAL_ID:
-			if (InterfaceNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case PrimitiveTypeEditPart.VISUAL_ID:
-			if (PrimitiveTypeNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case EnumerationEditPart.VISUAL_ID:
-			if (EnumerationNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (EnumerationLiteralEditPartCLN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case DataTypeEditPart.VISUAL_ID:
-			if (DataTypeNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DataTypeAttributeCompartmentEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DataTypeOperationCompartmentEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ActorEditPart.VISUAL_ID:
-			if (ActorNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case DeploymentSpecificationEditPart.VISUAL_ID:
-			if (DeploymentSpecificationNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ArtifactEditPart.VISUAL_ID:
-			if (ArtifactNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case InformationItemEditPart.VISUAL_ID:
-			if (InformationItemNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case SignalEditPart.VISUAL_ID:
-			if (SignalNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case UseCaseEditPart.VISUAL_ID:
-			if (UseCaseNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case SignalEventEditPart.VISUAL_ID:
-			if (SignalEventNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case CallEventEditPart.VISUAL_ID:
-			if (CallEventNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case AnyReceiveEventEditPart.VISUAL_ID:
-			if (AnyReceiveEventNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ChangeEventEditPart.VISUAL_ID:
-			if (ChangeEventNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case TimeEventEditPart.VISUAL_ID:
-			if (TimeEventNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case DurationObservationEditPart.VISUAL_ID:
-			if (DurationObservationNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationObservationStereotypeLabelEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case TimeObservationEditPart.VISUAL_ID:
-			if (TimeObservationNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeObservationStereotypeLabelEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case LiteralBooleanEditPart.VISUAL_ID:
-			if (LiteralBooleanNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case LiteralIntegerEditPart.VISUAL_ID:
-			if (LiteralIntegerNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case LiteralNullEditPart.VISUAL_ID:
-			if (LiteralNullNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case LiteralStringEditPart.VISUAL_ID:
-			if (LiteralStringNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case LiteralUnlimitedNaturalEditPart.VISUAL_ID:
-			if (LiteralUnlimitedNaturalNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case StringExpressionEditPart.VISUAL_ID:
-			if (StringExpressionNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case OpaqueExpressionEditPart.VISUAL_ID:
-			if (OpaqueExpressionNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case TimeExpressionEditPart.VISUAL_ID:
-			if (TimeExpressionNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ExpressionEditPart.VISUAL_ID:
-			if (ExpressionNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case DurationEditPart.VISUAL_ID:
-			if (DurationNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case TimeIntervalEditPart.VISUAL_ID:
-			if (TimeIntervalNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case DurationIntervalEditPart.VISUAL_ID:
-			if (DurationIntervalNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case IntervalEditPart.VISUAL_ID:
-			if (IntervalNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case InstanceValueEditPart.VISUAL_ID:
-			if (InstanceValueNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case CommentEditPart.VISUAL_ID:
-			if (CommentBodyEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case DurationConstraintEditPart.VISUAL_ID:
-			if (DurationConstraintNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationConstraintSpecificationEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case TimeConstraintEditPart.VISUAL_ID:
-			if (TimeConstraintNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeConstraintSpecificationEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case IntervalConstraintEditPart.VISUAL_ID:
-			if (IntervalConstraintNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalConstraintSpecificationEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case InteractionConstraintEditPart.VISUAL_ID:
-			if (InteractionConstraintNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionConstraintSpecificationEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ConstraintEditPart.VISUAL_ID:
-			if (ConstraintNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConstraintSpecificationEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case PortEditPart.VISUAL_ID:
-			if (PortNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PortAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ParameterEditPart.VISUAL_ID:
-			if (ParameterNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ParameterAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case PropertyPartEditPartCN.VISUAL_ID:
-			if (PropertyPartNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PropertyPartCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PortEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case CollaborationRoleEditPartCN.VISUAL_ID:
-			if (CollaborationRoleNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case CollaborationUseEditPartCN.VISUAL_ID:
-			if (CollaborationUseNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ActivityCompositeEditPartCN.VISUAL_ID:
-			if (ActivityCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActivityCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PortEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case InteractionCompositeEditPartCN.VISUAL_ID:
-			if (InteractionCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PortEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ProtocolStateMachineCompositeEditPartCN.VISUAL_ID:
-			if (ProtocolStateMachineCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PortEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case StateMachineCompositeEditPartCN.VISUAL_ID:
-			if (StateMachineCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (StateMachineCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PortEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case FunctionBehaviorCompositeEditPartCN.VISUAL_ID:
-			if (FunctionBehaviorCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PortEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case OpaqueBehaviorCompositeEditPartCN.VISUAL_ID:
-			if (OpaqueBehaviorCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PortEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ComponentCompositeEditPartCN.VISUAL_ID:
-			if (ComponentCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ComponentCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PortEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case DeviceCompositeEditPartCN.VISUAL_ID:
-			if (DeviceCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeviceCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PortEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID:
-			if (ExecutionEnvironmentCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PortEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case NodeCompositeEditPartCN.VISUAL_ID:
-			if (NodeCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (NodeCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PortEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ClassCompositeEditPartCN.VISUAL_ID:
-			if (ClassCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ClassCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PortEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case CollaborationCompositeEditPartCN.VISUAL_ID:
-			if (CollaborationCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case InterfaceEditPartCN.VISUAL_ID:
-			if (InterfaceNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case PrimitiveTypeEditPartCN.VISUAL_ID:
-			if (PrimitiveTypeNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case EnumerationEditPartCN.VISUAL_ID:
-			if (EnumerationNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (EnumerationLiteralEditPartCLN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case DataTypeEditPartCN.VISUAL_ID:
-			if (DataTypeNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DataTypeAttributeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DataTypeOperationCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ActorEditPartCN.VISUAL_ID:
-			if (ActorNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case DeploymentSpecificationEditPartCN.VISUAL_ID:
-			if (DeploymentSpecificationNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ArtifactEditPartCN.VISUAL_ID:
-			if (ArtifactNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case InformationItemEditPartCN.VISUAL_ID:
-			if (InformationItemNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case SignalEditPartCN.VISUAL_ID:
-			if (SignalNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case UseCaseEditPartCN.VISUAL_ID:
-			if (UseCaseNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case CommentEditPartCN.VISUAL_ID:
-			if (CommentBodyEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case DurationConstraintEditPartCN.VISUAL_ID:
-			if (DurationConstraintNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationConstraintSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case TimeConstraintEditPartCN.VISUAL_ID:
-			if (TimeConstraintNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeConstraintSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case IntervalConstraintEditPartCN.VISUAL_ID:
-			if (IntervalConstraintNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalConstraintSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case InteractionConstraintEditPartCN.VISUAL_ID:
-			if (InteractionConstraintNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionConstraintSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ConstraintEditPartCN.VISUAL_ID:
-			if (ConstraintNameEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConstraintSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case DataTypeAttributeCompartmentEditPart.VISUAL_ID:
-			if (PropertyEditPartCLN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case DataTypeOperationCompartmentEditPart.VISUAL_ID:
-			if (OperationEditPartCLN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case DataTypeAttributeCompartmentEditPartCN.VISUAL_ID:
-			if (PropertyEditPartCLN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case DataTypeOperationCompartmentEditPartCN.VISUAL_ID:
-			if (OperationEditPartCLN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID:
-			if (EnumerationLiteralEditPartCLN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID:
-			if (EnumerationLiteralEditPartCLN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ActivityCompositeCompartmentEditPartCN.VISUAL_ID:
-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case InteractionCompositeCompartmentEditPartCN.VISUAL_ID:
-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID:
-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case StateMachineCompositeCompartmentEditPartCN.VISUAL_ID:
-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:
-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:
-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ComponentCompositeCompartmentEditPartCN.VISUAL_ID:
-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case DeviceCompositeCompartmentEditPartCN.VISUAL_ID:
-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID:
-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case NodeCompositeCompartmentEditPartCN.VISUAL_ID:
-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ClassCompositeCompartmentEditPartCN.VISUAL_ID:
-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (BehaviorPortEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case CollaborationCompositeCompartmentEditPartCN.VISUAL_ID:
-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationRoleEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ActivityCompositeCompartmentEditPart.VISUAL_ID:
-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case InteractionCompositeCompartmentEditPart.VISUAL_ID:
-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID:
-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case StateMachineCompositeCompartmentEditPart.VISUAL_ID:
-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID:
-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID:
-			if (ParameterEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ComponentCompositeCompartmentEditPart.VISUAL_ID:
-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case DeviceCompositeCompartmentEditPart.VISUAL_ID:
-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID:
-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case NodeCompositeCompartmentEditPart.VISUAL_ID:
-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ClassCompositeCompartmentEditPart.VISUAL_ID:
-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ActorEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (SignalEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case CollaborationCompositeCompartmentEditPart.VISUAL_ID:
-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CollaborationRoleEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case PropertyPartCompartmentEditPartCN.VISUAL_ID:
-			if (PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (CommentEditPartCN.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ComponentRealizationEditPart.VISUAL_ID:
-			if (ComponentRealizationNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case InterfaceRealizationEditPart.VISUAL_ID:
-			if (InterfaceRealizationNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case SubstitutionEditPart.VISUAL_ID:
-			if (SubstitutionNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (SubstitutionAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case RealizationEditPart.VISUAL_ID:
-			if (RealizationNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (RealizationAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ManifestationEditPart.VISUAL_ID:
-			if (ManifestationNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ManifestationAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case AbstractionEditPart.VISUAL_ID:
-			if (AbstractionNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (AbstractionAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case UsageEditPart.VISUAL_ID:
-			if (UsageNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (UsageAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case DeploymentEditPart.VISUAL_ID:
-			if (DeploymentNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DeploymentAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case RoleBindingEditPart.VISUAL_ID:
-			if (RoleBindingRoleNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (RoleBindingAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case DependencyEditPart.VISUAL_ID:
-			if (DependencyNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (DependencyAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case ConnectorEditPart.VISUAL_ID:
-			if (ConnectorAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConnectorNameEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConnectorMultiplicitySourceEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (ConnectorMultiplicityTargetEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case GeneralizationEditPart.VISUAL_ID:
-			if (GeneralizationAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case RepresentationEditPart.VISUAL_ID:
-			if (RepresentationTagLabelEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		case InformationFlowEditPart.VISUAL_ID:
-			if (InformationFlowConveyedLabelEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			if (InformationFlowAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {
-				return true;
-			}
-			break;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static int getLinkWithClassVisualID(EObject domainElement) {
-		if (domainElement == null) {
-			return -1;
-		}
-		if (UMLPackage.eINSTANCE.getComponentRealization().isSuperTypeOf(domainElement.eClass())) {
-			return ComponentRealizationEditPart.VISUAL_ID;
-		}
-		if (UMLPackage.eINSTANCE.getInterfaceRealization().isSuperTypeOf(domainElement.eClass())) {
-			return InterfaceRealizationEditPart.VISUAL_ID;
-		}
-		if (UMLPackage.eINSTANCE.getSubstitution().isSuperTypeOf(domainElement.eClass())) {
-			return SubstitutionEditPart.VISUAL_ID;
-		}
-		if (UMLPackage.eINSTANCE.getRealization().isSuperTypeOf(domainElement.eClass())) {
-			return RealizationEditPart.VISUAL_ID;
-		}
-		if (UMLPackage.eINSTANCE.getManifestation().isSuperTypeOf(domainElement.eClass())) {
-			return ManifestationEditPart.VISUAL_ID;
-		}
-		if (UMLPackage.eINSTANCE.getAbstraction().isSuperTypeOf(domainElement.eClass())) {
-			return AbstractionEditPart.VISUAL_ID;
-		}
-		if (UMLPackage.eINSTANCE.getUsage().isSuperTypeOf(domainElement.eClass())) {
-			return UsageEditPart.VISUAL_ID;
-		}
-		if (UMLPackage.eINSTANCE.getDeployment().isSuperTypeOf(domainElement.eClass())) {
-			return DeploymentEditPart.VISUAL_ID;
-		}
-		if (UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass()) && isDependency_4017((Dependency) domainElement)) {
-			return RoleBindingEditPart.VISUAL_ID;
-		}
-		if (UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass()) && isDependency_4010((Dependency) domainElement)) {
-			return DependencyEditPart.VISUAL_ID;
-		}
-		if (UMLPackage.eINSTANCE.getConnector().isSuperTypeOf(domainElement.eClass())) {
-			return ConnectorEditPart.VISUAL_ID;
-		}
-		if (UMLPackage.eINSTANCE.getGeneralization().isSuperTypeOf(domainElement.eClass())) {
-			return GeneralizationEditPart.VISUAL_ID;
-		}
-		if (UMLPackage.eINSTANCE.getInformationFlow().isSuperTypeOf(domainElement.eClass())) {
-			return InformationFlowEditPart.VISUAL_ID;
-		}
-		return -1;
-	}
-
-	/**
-	 * User can change implementation of this method to handle some specific
-	 * situations not covered by default logic.
-	 * 
-	 * @generated
-	 */
-	private static boolean isDiagram(Package element) {
-		return true;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static boolean isProperty_3070(View containerView, Property domainElement) {
-		// Property / CollaborationRole constraint		
-		// Restriction for the case where domainElement owner is a Collaboration
-		// If the domainElement is not referenced as one of its owner role
-		// then it should be considered as a Property creation on Collaboration,
-		// else the test should return false and be considered as a representation of
-		// a collaboration role (ConnectableElement).
-		if (containerView.getElement() instanceof Collaboration) {
-			Collaboration graphicalParent = (Collaboration) containerView.getElement();
-			if (graphicalParent.getCollaborationRoles().contains(domainElement)) {
-				return false;
-			}
-		}
-		// General case : no restriction
-		return true;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static boolean isDependency_4017(Dependency domainElement) {
-		// Test if the dependency is a RoleBinding
-		if (domainElement.getOwner() instanceof CollaborationUse) {
-			CollaborationUse owner = (CollaborationUse) domainElement.getOwner();
-			if (owner.getRoleBindings().contains(domainElement)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static boolean isDependency_4010(Dependency domainElement) {
-		// Test if the dependency is not a RoleBinding
-		if (domainElement.getOwner() instanceof CollaborationUse) {
-			CollaborationUse owner = (CollaborationUse) domainElement.getOwner();
-			if (owner.getRoleBindings().contains(domainElement)) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static boolean checkNodeVisualID(View containerView, EObject domainElement, int candidate) {
-		if (candidate == -1) {
-			//unrecognized id is always bad
-			return false;
-		}
-		int basic = getNodeVisualID(containerView, domainElement);
-		return basic == candidate;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static boolean isCompartmentVisualID(int visualID) {
-		switch (visualID) {
-		case DataTypeAttributeCompartmentEditPart.VISUAL_ID:
-		case DataTypeOperationCompartmentEditPart.VISUAL_ID:
-		case DataTypeAttributeCompartmentEditPartCN.VISUAL_ID:
-		case DataTypeOperationCompartmentEditPartCN.VISUAL_ID:
-		case EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID:
-		case EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID:
-		case ActivityCompositeCompartmentEditPartCN.VISUAL_ID:
-		case InteractionCompositeCompartmentEditPartCN.VISUAL_ID:
-		case ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID:
-		case StateMachineCompositeCompartmentEditPartCN.VISUAL_ID:
-		case FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:
-		case OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:
-		case ComponentCompositeCompartmentEditPartCN.VISUAL_ID:
-		case DeviceCompositeCompartmentEditPartCN.VISUAL_ID:
-		case ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID:
-		case NodeCompositeCompartmentEditPartCN.VISUAL_ID:
-		case ClassCompositeCompartmentEditPartCN.VISUAL_ID:
-		case CollaborationCompositeCompartmentEditPartCN.VISUAL_ID:
-		case ActivityCompositeCompartmentEditPart.VISUAL_ID:
-		case InteractionCompositeCompartmentEditPart.VISUAL_ID:
-		case ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID:
-		case StateMachineCompositeCompartmentEditPart.VISUAL_ID:
-		case FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID:
-		case OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID:
-		case ComponentCompositeCompartmentEditPart.VISUAL_ID:
-		case DeviceCompositeCompartmentEditPart.VISUAL_ID:
-		case ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID:
-		case NodeCompositeCompartmentEditPart.VISUAL_ID:
-		case ClassCompositeCompartmentEditPart.VISUAL_ID:
-		case CollaborationCompositeCompartmentEditPart.VISUAL_ID:
-		case PropertyPartCompartmentEditPartCN.VISUAL_ID:
-			return true;
-		default:
-			break;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static boolean isSemanticLeafVisualID(int visualID) {
-		switch (visualID) {
-		case CompositeStructureDiagramEditPart.VISUAL_ID:
-			return false;
-		case PrimitiveTypeEditPart.VISUAL_ID:
-		case InterfaceEditPart.VISUAL_ID:
-		case ActorEditPart.VISUAL_ID:
-		case DeploymentSpecificationEditPart.VISUAL_ID:
-		case ArtifactEditPart.VISUAL_ID:
-		case InformationItemEditPart.VISUAL_ID:
-		case SignalEditPart.VISUAL_ID:
-		case UseCaseEditPart.VISUAL_ID:
-		case SignalEventEditPart.VISUAL_ID:
-		case CallEventEditPart.VISUAL_ID:
-		case AnyReceiveEventEditPart.VISUAL_ID:
-		case ChangeEventEditPart.VISUAL_ID:
-		case TimeEventEditPart.VISUAL_ID:
-		case DurationObservationEditPart.VISUAL_ID:
-		case TimeObservationEditPart.VISUAL_ID:
-		case LiteralBooleanEditPart.VISUAL_ID:
-		case LiteralIntegerEditPart.VISUAL_ID:
-		case LiteralNullEditPart.VISUAL_ID:
-		case LiteralStringEditPart.VISUAL_ID:
-		case LiteralUnlimitedNaturalEditPart.VISUAL_ID:
-		case StringExpressionEditPart.VISUAL_ID:
-		case OpaqueExpressionEditPart.VISUAL_ID:
-		case TimeExpressionEditPart.VISUAL_ID:
-		case ExpressionEditPart.VISUAL_ID:
-		case DurationEditPart.VISUAL_ID:
-		case TimeIntervalEditPart.VISUAL_ID:
-		case DurationIntervalEditPart.VISUAL_ID:
-		case IntervalEditPart.VISUAL_ID:
-		case InstanceValueEditPart.VISUAL_ID:
-		case CommentEditPart.VISUAL_ID:
-		case DurationConstraintEditPart.VISUAL_ID:
-		case TimeConstraintEditPart.VISUAL_ID:
-		case IntervalConstraintEditPart.VISUAL_ID:
-		case InteractionConstraintEditPart.VISUAL_ID:
-		case ConstraintEditPart.VISUAL_ID:
-		case EnumerationLiteralEditPartCLN.VISUAL_ID:
-		case PortEditPart.VISUAL_ID:
-		case CollaborationUseEditPartCN.VISUAL_ID:
-		case PrimitiveTypeEditPartCN.VISUAL_ID:
-		case InterfaceEditPartCN.VISUAL_ID:
-		case ParameterEditPart.VISUAL_ID:
-		case ActorEditPartCN.VISUAL_ID:
-		case DeploymentSpecificationEditPartCN.VISUAL_ID:
-		case ArtifactEditPartCN.VISUAL_ID:
-		case InformationItemEditPartCN.VISUAL_ID:
-		case SignalEditPartCN.VISUAL_ID:
-		case UseCaseEditPartCN.VISUAL_ID:
-		case CommentEditPartCN.VISUAL_ID:
-		case PropertyEditPartCLN.VISUAL_ID:
-		case OperationEditPartCLN.VISUAL_ID:
-		case CollaborationRoleEditPartCN.VISUAL_ID:
-		case DurationConstraintEditPartCN.VISUAL_ID:
-		case TimeConstraintEditPartCN.VISUAL_ID:
-		case IntervalConstraintEditPartCN.VISUAL_ID:
-		case InteractionConstraintEditPartCN.VISUAL_ID:
-		case ConstraintEditPartCN.VISUAL_ID:
-		case BehaviorPortEditPart.VISUAL_ID:
-			return true;
-		default:
-			break;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static final DiagramStructure TYPED_INSTANCE = new DiagramStructure() {
-		/**
-		 * @generated
-		 */
-		@Override
-		public int getVisualID(View view) {
-			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getVisualID(view);
-		}
-
-		/**
-		 * @generated
-		 */
-		@Override
-		public String getModelID(View view) {
-			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getModelID(view);
-		}
-
-		/**
-		 * @generated
-		 */
-		@Override
-		public int getNodeVisualID(View containerView, EObject domainElement) {
-			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getNodeVisualID(containerView, domainElement);
-		}
-
-		/**
-		 * @generated
-		 */
-		@Override
-		public boolean checkNodeVisualID(View containerView, EObject domainElement, int candidate) {
-			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.checkNodeVisualID(containerView, domainElement, candidate);
-		}
-
-		/**
-		 * @generated
-		 */
-		@Override
-		public boolean isCompartmentVisualID(int visualID) {
-			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.isCompartmentVisualID(visualID);
-		}
-
-		/**
-		 * @generated
-		 */
-		@Override
-		public boolean isSemanticLeafVisualID(int visualID) {
-			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.isSemanticLeafVisualID(visualID);
-		}
-	};
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.part;

+

+import org.eclipse.core.runtime.Platform;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.tooling.runtime.structure.DiagramStructure;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.*;

+import org.eclipse.uml2.uml.Collaboration;

+import org.eclipse.uml2.uml.CollaborationUse;

+import org.eclipse.uml2.uml.Dependency;

+import org.eclipse.uml2.uml.Package;

+import org.eclipse.uml2.uml.Property;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * This registry is used to determine which type of visual object should be

+ * created for the corresponding Diagram, Node, ChildNode or Link represented

+ * by a domain model object.

+ * 

+ * @generated

+ */

+public class UMLVisualIDRegistry {

+

+	/**

+	 * @generated

+	 */

+	private static final String DEBUG_KEY = "org.eclipse.papyrus.uml.diagram.composite/debug/visualID"; //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static int getVisualID(View view) {

+		if(view instanceof Diagram) {

+			if(CompositeStructureDiagramEditPart.MODEL_ID.equals(view.getType())) {

+				return CompositeStructureDiagramEditPart.VISUAL_ID;

+			} else {

+				return -1;

+			}

+		}

+		return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getVisualID(view.getType());

+	}

+

+	/**

+	 * @generated

+	 */

+	public static String getModelID(View view) {

+		View diagram = view.getDiagram();

+		while(view != diagram) {

+			EAnnotation annotation = view.getEAnnotation("Shortcut"); //$NON-NLS-1$

+			if(annotation != null) {

+				return (String)annotation.getDetails().get("modelID"); //$NON-NLS-1$

+			}

+			view = (View)view.eContainer();

+		}

+		return diagram != null ? diagram.getType() : null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static int getVisualID(String type) {

+		try {

+			return Integer.parseInt(type);

+		} catch (NumberFormatException e) {

+			if(Boolean.TRUE.toString().equalsIgnoreCase(Platform.getDebugOption(DEBUG_KEY))) {

+				UMLDiagramEditorPlugin.getInstance().logError("Unable to parse view type as a visualID number: " + type);

+			}

+		}

+		return -1;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static String getType(int visualID) {

+		return Integer.toString(visualID);

+	}

+

+	/**

+	 * @generated

+	 */

+	public static int getDiagramVisualID(EObject domainElement) {

+		if(domainElement == null) {

+			return -1;

+		}

+		return 1000;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static int getNodeVisualID(View containerView, EObject domainElement) {

+		if(domainElement == null) {

+			return -1;

+		}

+		String containerModelID = org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getModelID(containerView);

+		if(!CompositeStructureDiagramEditPart.MODEL_ID.equals(containerModelID)) {

+			return -1;

+		}

+		int containerVisualID;

+		if(CompositeStructureDiagramEditPart.MODEL_ID.equals(containerModelID)) {

+			containerVisualID = org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getVisualID(containerView);

+		} else {

+			if(containerView instanceof Diagram) {

+				containerVisualID = CompositeStructureDiagramEditPart.VISUAL_ID;

+			} else {

+				return -1;

+			}

+		}

+		switch(containerVisualID) {

+		case CompositeStructureDiagramEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+				return ActivityCompositeEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionCompositeEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return ProtocolStateMachineCompositeEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return StateMachineCompositeEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return FunctionBehaviorCompositeEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return OpaqueBehaviorCompositeEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+				return ComponentCompositeEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+				return DeviceCompositeEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+				return ExecutionEnvironmentCompositeEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+				return NodeCompositeEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+				return ClassCompositeEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationCompositeEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+				return InterfaceEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+				return PrimitiveTypeEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+				return EnumerationEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+				return DataTypeEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+				return ActorEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+				return DeploymentSpecificationEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+				return ArtifactEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+				return InformationItemEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+				return SignalEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+				return UseCaseEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getSignalEvent().isSuperTypeOf(domainElement.eClass())) {

+				return SignalEventEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCallEvent().isSuperTypeOf(domainElement.eClass())) {

+				return CallEventEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getAnyReceiveEvent().isSuperTypeOf(domainElement.eClass())) {

+				return AnyReceiveEventEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getChangeEvent().isSuperTypeOf(domainElement.eClass())) {

+				return ChangeEventEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeEvent().isSuperTypeOf(domainElement.eClass())) {

+				return TimeEventEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDurationObservation().isSuperTypeOf(domainElement.eClass())) {

+				return DurationObservationEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeObservation().isSuperTypeOf(domainElement.eClass())) {

+				return TimeObservationEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getLiteralBoolean().isSuperTypeOf(domainElement.eClass())) {

+				return LiteralBooleanEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getLiteralInteger().isSuperTypeOf(domainElement.eClass())) {

+				return LiteralIntegerEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getLiteralNull().isSuperTypeOf(domainElement.eClass())) {

+				return LiteralNullEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getLiteralString().isSuperTypeOf(domainElement.eClass())) {

+				return LiteralStringEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getLiteralUnlimitedNatural().isSuperTypeOf(domainElement.eClass())) {

+				return LiteralUnlimitedNaturalEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getStringExpression().isSuperTypeOf(domainElement.eClass())) {

+				return StringExpressionEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getOpaqueExpression().isSuperTypeOf(domainElement.eClass())) {

+				return OpaqueExpressionEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeExpression().isSuperTypeOf(domainElement.eClass())) {

+				return TimeExpressionEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getExpression().isSuperTypeOf(domainElement.eClass())) {

+				return ExpressionEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDuration().isSuperTypeOf(domainElement.eClass())) {

+				return DurationEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeInterval().isSuperTypeOf(domainElement.eClass())) {

+				return TimeIntervalEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDurationInterval().isSuperTypeOf(domainElement.eClass())) {

+				return DurationIntervalEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInterval().isSuperTypeOf(domainElement.eClass())) {

+				return IntervalEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInstanceValue().isSuperTypeOf(domainElement.eClass())) {

+				return InstanceValueEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+				return CommentEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return DurationConstraintEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return TimeConstraintEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return IntervalConstraintEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionConstraintEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return ConstraintEditPart.VISUAL_ID;

+			}

+			break;

+		case ActivityCompositeEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+				return PortEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+				return ParameterEditPart.VISUAL_ID;

+			}

+			break;

+		case InteractionCompositeEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+				return PortEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+				return ParameterEditPart.VISUAL_ID;

+			}

+			break;

+		case ProtocolStateMachineCompositeEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+				return PortEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+				return ParameterEditPart.VISUAL_ID;

+			}

+			break;

+		case StateMachineCompositeEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+				return PortEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+				return ParameterEditPart.VISUAL_ID;

+			}

+			break;

+		case FunctionBehaviorCompositeEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+				return PortEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+				return ParameterEditPart.VISUAL_ID;

+			}

+			break;

+		case OpaqueBehaviorCompositeEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+				return PortEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+				return ParameterEditPart.VISUAL_ID;

+			}

+			break;

+		case ComponentCompositeEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+				return PortEditPart.VISUAL_ID;

+			}

+			break;

+		case DeviceCompositeEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+				return PortEditPart.VISUAL_ID;

+			}

+			break;

+		case ExecutionEnvironmentCompositeEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+				return PortEditPart.VISUAL_ID;

+			}

+			break;

+		case NodeCompositeEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+				return PortEditPart.VISUAL_ID;

+			}

+			break;

+		case ClassCompositeEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+				return PortEditPart.VISUAL_ID;

+			}

+			break;

+		case EnumerationEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getEnumerationLiteral().isSuperTypeOf(domainElement.eClass())) {

+				return EnumerationLiteralEditPartCLN.VISUAL_ID;

+			}

+			break;

+		case PropertyPartEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+				return PortEditPart.VISUAL_ID;

+			}

+			break;

+		case ActivityCompositeEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+				return PortEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+				return ParameterEditPart.VISUAL_ID;

+			}

+			break;

+		case InteractionCompositeEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+				return PortEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+				return ParameterEditPart.VISUAL_ID;

+			}

+			break;

+		case ProtocolStateMachineCompositeEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+				return PortEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+				return ParameterEditPart.VISUAL_ID;

+			}

+			break;

+		case StateMachineCompositeEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+				return PortEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+				return ParameterEditPart.VISUAL_ID;

+			}

+			break;

+		case FunctionBehaviorCompositeEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+				return PortEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+				return ParameterEditPart.VISUAL_ID;

+			}

+			break;

+		case OpaqueBehaviorCompositeEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+				return PortEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+				return ParameterEditPart.VISUAL_ID;

+			}

+			break;

+		case ComponentCompositeEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+				return PortEditPart.VISUAL_ID;

+			}

+			break;

+		case DeviceCompositeEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+				return PortEditPart.VISUAL_ID;

+			}

+			break;

+		case ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+				return PortEditPart.VISUAL_ID;

+			}

+			break;

+		case NodeCompositeEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+				return PortEditPart.VISUAL_ID;

+			}

+			break;

+		case ClassCompositeEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getPort().isSuperTypeOf(domainElement.eClass())) {

+				return PortEditPart.VISUAL_ID;

+			}

+			break;

+		case EnumerationEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getEnumerationLiteral().isSuperTypeOf(domainElement.eClass())) {

+				return EnumerationLiteralEditPartCLN.VISUAL_ID;

+			}

+			break;

+		case DataTypeAttributeCompartmentEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {

+				return PropertyEditPartCLN.VISUAL_ID;

+			}

+			break;

+		case DataTypeOperationCompartmentEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) {

+				return OperationEditPartCLN.VISUAL_ID;

+			}

+			break;

+		case DataTypeAttributeCompartmentEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {

+				return PropertyEditPartCLN.VISUAL_ID;

+			}

+			break;

+		case DataTypeOperationCompartmentEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getOperation().isSuperTypeOf(domainElement.eClass())) {

+				return OperationEditPartCLN.VISUAL_ID;

+			}

+			break;

+		case EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getEnumerationLiteral().isSuperTypeOf(domainElement.eClass())) {

+				return EnumerationLiteralEditPartCLN.VISUAL_ID;

+			}

+			break;

+		case EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getEnumerationLiteral().isSuperTypeOf(domainElement.eClass())) {

+				return EnumerationLiteralEditPartCLN.VISUAL_ID;

+			}

+			break;

+		case ActivityCompositeCompartmentEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+				return ParameterEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationUseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+				return ActivityCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return StateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+				return ComponentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+				return DeviceCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+				return NodeCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+				return ClassCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+				return InterfaceEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+				return PrimitiveTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+				return EnumerationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+				return DataTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+				return ActorEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+				return DeploymentSpecificationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+				return ArtifactEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+				return InformationItemEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+				return SignalEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+				return UseCaseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+				return CommentEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return DurationConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return TimeConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return IntervalConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return ConstraintEditPartCN.VISUAL_ID;

+			}

+			break;

+		case InteractionCompositeCompartmentEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+				return ParameterEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationUseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+				return ActivityCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return StateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+				return ComponentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+				return DeviceCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+				return NodeCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+				return ClassCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+				return InterfaceEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+				return PrimitiveTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+				return EnumerationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+				return DataTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+				return ActorEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+				return DeploymentSpecificationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+				return ArtifactEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+				return InformationItemEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+				return SignalEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+				return UseCaseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+				return CommentEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return DurationConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return TimeConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return IntervalConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return ConstraintEditPartCN.VISUAL_ID;

+			}

+			break;

+		case ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+				return ParameterEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationUseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+				return ActivityCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return StateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+				return ComponentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+				return DeviceCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+				return NodeCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+				return ClassCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+				return InterfaceEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+				return PrimitiveTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+				return EnumerationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+				return DataTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+				return ActorEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+				return DeploymentSpecificationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+				return ArtifactEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+				return InformationItemEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+				return SignalEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+				return UseCaseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+				return CommentEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return DurationConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return TimeConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return IntervalConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return ConstraintEditPartCN.VISUAL_ID;

+			}

+			break;

+		case StateMachineCompositeCompartmentEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+				return ParameterEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationUseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+				return ActivityCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return StateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+				return ComponentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+				return DeviceCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+				return NodeCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+				return ClassCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+				return InterfaceEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+				return PrimitiveTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+				return EnumerationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+				return DataTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+				return ActorEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+				return DeploymentSpecificationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+				return ArtifactEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+				return InformationItemEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+				return SignalEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+				return UseCaseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+				return CommentEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return DurationConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return TimeConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return IntervalConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return ConstraintEditPartCN.VISUAL_ID;

+			}

+			break;

+		case FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+				return ParameterEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationUseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+				return ActivityCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return StateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+				return ComponentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+				return DeviceCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+				return NodeCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+				return ClassCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+				return InterfaceEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+				return PrimitiveTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+				return EnumerationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+				return DataTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+				return ActorEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+				return DeploymentSpecificationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+				return ArtifactEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+				return InformationItemEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+				return SignalEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+				return UseCaseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+				return CommentEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return DurationConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return TimeConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return IntervalConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return ConstraintEditPartCN.VISUAL_ID;

+			}

+			break;

+		case OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+				return ParameterEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationUseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+				return ActivityCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return StateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+				return ComponentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+				return DeviceCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+				return NodeCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+				return ClassCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+				return InterfaceEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+				return PrimitiveTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+				return EnumerationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+				return DataTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+				return ActorEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+				return DeploymentSpecificationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+				return ArtifactEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+				return InformationItemEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+				return SignalEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+				return UseCaseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+				return CommentEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return DurationConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return TimeConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return IntervalConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return ConstraintEditPartCN.VISUAL_ID;

+			}

+			break;

+		case ComponentCompositeCompartmentEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationUseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+				return ActivityCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return StateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+				return ComponentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+				return DeviceCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+				return NodeCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+				return ClassCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+				return InterfaceEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+				return PrimitiveTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+				return EnumerationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+				return DataTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+				return ActorEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+				return DeploymentSpecificationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+				return ArtifactEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+				return InformationItemEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+				return SignalEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+				return UseCaseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+				return CommentEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return DurationConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return TimeConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return IntervalConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return ConstraintEditPartCN.VISUAL_ID;

+			}

+			break;

+		case DeviceCompositeCompartmentEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationUseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+				return ActivityCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return StateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+				return ComponentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+				return DeviceCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+				return NodeCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+				return ClassCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+				return InterfaceEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+				return PrimitiveTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+				return EnumerationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+				return DataTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+				return ActorEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+				return DeploymentSpecificationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+				return ArtifactEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+				return InformationItemEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+				return SignalEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+				return UseCaseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+				return CommentEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return DurationConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return TimeConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return IntervalConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return ConstraintEditPartCN.VISUAL_ID;

+			}

+			break;

+		case ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationUseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+				return ActivityCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return StateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+				return ComponentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+				return DeviceCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+				return NodeCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+				return ClassCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+				return InterfaceEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+				return PrimitiveTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+				return EnumerationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+				return DataTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+				return ActorEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+				return DeploymentSpecificationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+				return ArtifactEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+				return InformationItemEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+				return SignalEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+				return UseCaseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+				return CommentEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return DurationConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return TimeConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return IntervalConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return ConstraintEditPartCN.VISUAL_ID;

+			}

+			break;

+		case NodeCompositeCompartmentEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationUseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+				return ActivityCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return StateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+				return ComponentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+				return DeviceCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+				return NodeCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+				return ClassCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+				return InterfaceEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+				return PrimitiveTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+				return EnumerationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+				return DataTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+				return ActorEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+				return DeploymentSpecificationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+				return ArtifactEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+				return InformationItemEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+				return SignalEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+				return UseCaseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+				return CommentEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return DurationConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return TimeConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return IntervalConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return ConstraintEditPartCN.VISUAL_ID;

+			}

+			break;

+		case ClassCompositeCompartmentEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationUseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+				return ActivityCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return StateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+				return ComponentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+				return DeviceCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+				return NodeCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+				return ClassCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+				return InterfaceEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+				return PrimitiveTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+				return EnumerationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+				return DataTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+				return ActorEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+				return DeploymentSpecificationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+				return ArtifactEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+				return InformationItemEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+				return SignalEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+				return UseCaseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+				return CommentEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return DurationConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return TimeConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return IntervalConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return ConstraintEditPartCN.VISUAL_ID;

+			}

+			break;

+		case CollaborationCompositeCompartmentEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationUseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+				return CommentEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getConnectableElement().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationRoleEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return DurationConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return TimeConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return IntervalConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return ConstraintEditPartCN.VISUAL_ID;

+			}

+			break;

+		case ActivityCompositeCompartmentEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+				return ParameterEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationUseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+				return ActivityCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return StateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+				return ComponentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+				return DeviceCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+				return NodeCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+				return ClassCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+				return InterfaceEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+				return PrimitiveTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+				return EnumerationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+				return DataTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+				return ActorEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+				return DeploymentSpecificationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+				return ArtifactEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+				return InformationItemEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+				return SignalEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+				return UseCaseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+				return CommentEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return DurationConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return TimeConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return IntervalConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return ConstraintEditPartCN.VISUAL_ID;

+			}

+			break;

+		case InteractionCompositeCompartmentEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+				return ParameterEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationUseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+				return ActivityCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return StateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+				return ComponentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+				return DeviceCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+				return NodeCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+				return ClassCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+				return InterfaceEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+				return PrimitiveTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+				return EnumerationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+				return DataTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+				return ActorEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+				return DeploymentSpecificationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+				return ArtifactEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+				return InformationItemEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+				return SignalEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+				return UseCaseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+				return CommentEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return DurationConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return TimeConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return IntervalConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return ConstraintEditPartCN.VISUAL_ID;

+			}

+			break;

+		case ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+				return ParameterEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationUseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+				return ActivityCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return StateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+				return ComponentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+				return DeviceCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+				return NodeCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+				return ClassCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+				return InterfaceEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+				return PrimitiveTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+				return EnumerationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+				return DataTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+				return ActorEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+				return DeploymentSpecificationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+				return ArtifactEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+				return InformationItemEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+				return SignalEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+				return UseCaseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+				return CommentEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return DurationConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return TimeConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return IntervalConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return ConstraintEditPartCN.VISUAL_ID;

+			}

+			break;

+		case StateMachineCompositeCompartmentEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+				return ParameterEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationUseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+				return ActivityCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return StateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+				return ComponentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+				return DeviceCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+				return NodeCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+				return ClassCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+				return InterfaceEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+				return PrimitiveTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+				return EnumerationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+				return DataTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+				return ActorEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+				return DeploymentSpecificationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+				return ArtifactEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+				return InformationItemEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+				return SignalEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+				return UseCaseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+				return CommentEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return DurationConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return TimeConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return IntervalConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return ConstraintEditPartCN.VISUAL_ID;

+			}

+			break;

+		case FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+				return ParameterEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationUseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+				return ActivityCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return StateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+				return ComponentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+				return DeviceCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+				return NodeCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+				return ClassCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+				return InterfaceEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+				return PrimitiveTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+				return EnumerationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+				return DataTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+				return ActorEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+				return DeploymentSpecificationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+				return ArtifactEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+				return InformationItemEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+				return SignalEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+				return UseCaseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+				return CommentEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return DurationConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return TimeConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return IntervalConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return ConstraintEditPartCN.VISUAL_ID;

+			}

+			break;

+		case OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getParameter().isSuperTypeOf(domainElement.eClass())) {

+				return ParameterEditPart.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationUseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+				return ActivityCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return StateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+				return ComponentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+				return DeviceCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+				return NodeCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+				return ClassCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+				return InterfaceEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+				return PrimitiveTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+				return EnumerationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+				return DataTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+				return ActorEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+				return DeploymentSpecificationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+				return ArtifactEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+				return InformationItemEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+				return SignalEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+				return UseCaseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+				return CommentEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return DurationConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return TimeConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return IntervalConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return ConstraintEditPartCN.VISUAL_ID;

+			}

+			break;

+		case ComponentCompositeCompartmentEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationUseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+				return ActivityCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return StateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+				return ComponentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+				return DeviceCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+				return NodeCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+				return ClassCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+				return InterfaceEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+				return PrimitiveTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+				return EnumerationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+				return DataTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+				return ActorEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+				return DeploymentSpecificationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+				return ArtifactEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+				return InformationItemEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+				return SignalEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+				return UseCaseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+				return CommentEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return DurationConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return TimeConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return IntervalConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return ConstraintEditPartCN.VISUAL_ID;

+			}

+			break;

+		case DeviceCompositeCompartmentEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationUseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+				return ActivityCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return StateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+				return ComponentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+				return DeviceCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+				return NodeCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+				return ClassCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+				return InterfaceEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+				return PrimitiveTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+				return EnumerationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+				return DataTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+				return ActorEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+				return DeploymentSpecificationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+				return ArtifactEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+				return InformationItemEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+				return SignalEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+				return UseCaseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+				return CommentEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return DurationConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return TimeConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return IntervalConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return ConstraintEditPartCN.VISUAL_ID;

+			}

+			break;

+		case ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationUseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+				return ActivityCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return StateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+				return ComponentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+				return DeviceCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+				return NodeCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+				return ClassCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+				return InterfaceEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+				return PrimitiveTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+				return EnumerationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+				return DataTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+				return ActorEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+				return DeploymentSpecificationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+				return ArtifactEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+				return InformationItemEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+				return SignalEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+				return UseCaseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+				return CommentEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return DurationConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return TimeConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return IntervalConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return ConstraintEditPartCN.VISUAL_ID;

+			}

+			break;

+		case NodeCompositeCompartmentEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationUseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+				return ActivityCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return StateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+				return ComponentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+				return DeviceCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+				return NodeCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+				return ClassCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+				return InterfaceEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+				return PrimitiveTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+				return EnumerationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+				return DataTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+				return ActorEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+				return DeploymentSpecificationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+				return ArtifactEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+				return InformationItemEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+				return SignalEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+				return UseCaseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+				return CommentEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return DurationConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return TimeConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return IntervalConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return ConstraintEditPartCN.VISUAL_ID;

+			}

+			break;

+		case ClassCompositeCompartmentEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationUseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(domainElement.eClass())) {

+				return ActivityCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteraction().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getProtocolStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return ProtocolStateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getStateMachine().isSuperTypeOf(domainElement.eClass())) {

+				return StateMachineCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getFunctionBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return FunctionBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getOpaqueBehavior().isSuperTypeOf(domainElement.eClass())) {

+				return OpaqueBehaviorCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComponent().isSuperTypeOf(domainElement.eClass())) {

+				return ComponentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {

+				return DeviceCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {

+				return ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass())) {

+				return NodeCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getClass_().isSuperTypeOf(domainElement.eClass())) {

+				return ClassCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaboration().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationCompositeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInterface().isSuperTypeOf(domainElement.eClass())) {

+				return InterfaceEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getPrimitiveType().isSuperTypeOf(domainElement.eClass())) {

+				return PrimitiveTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getEnumeration().isSuperTypeOf(domainElement.eClass())) {

+				return EnumerationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDataType().isSuperTypeOf(domainElement.eClass())) {

+				return DataTypeEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getActor().isSuperTypeOf(domainElement.eClass())) {

+				return ActorEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {

+				return DeploymentSpecificationEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {

+				return ArtifactEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInformationItem().isSuperTypeOf(domainElement.eClass())) {

+				return InformationItemEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getSignal().isSuperTypeOf(domainElement.eClass())) {

+				return SignalEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getUseCase().isSuperTypeOf(domainElement.eClass())) {

+				return UseCaseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+				return CommentEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return ConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return DurationConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return TimeConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return IntervalConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionConstraintEditPartCN.VISUAL_ID;

+			}

+			break;

+		case CollaborationCompositeCompartmentEditPart.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getCollaborationUse().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationUseEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+				return CommentEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getConnectableElement().isSuperTypeOf(domainElement.eClass())) {

+				return CollaborationRoleEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getDurationConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return DurationConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getTimeConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return TimeConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getIntervalConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return IntervalConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getInteractionConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return InteractionConstraintEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getConstraint().isSuperTypeOf(domainElement.eClass())) {

+				return ConstraintEditPartCN.VISUAL_ID;

+			}

+			break;

+		case PropertyPartCompartmentEditPartCN.VISUAL_ID:

+			if(UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass()) && isProperty_3070(containerView, (Property)domainElement)) {

+				return PropertyPartEditPartCN.VISUAL_ID;

+			}

+			if(UMLPackage.eINSTANCE.getComment().isSuperTypeOf(domainElement.eClass())) {

+				return CommentEditPartCN.VISUAL_ID;

+			}

+			break;

+		}

+		return -1;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static boolean canCreateNode(View containerView, int nodeVisualID) {

+		String containerModelID = org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getModelID(containerView);

+		if(!CompositeStructureDiagramEditPart.MODEL_ID.equals(containerModelID)) {

+			return false;

+		}

+		int containerVisualID;

+		if(CompositeStructureDiagramEditPart.MODEL_ID.equals(containerModelID)) {

+			containerVisualID = org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getVisualID(containerView);

+		} else {

+			if(containerView instanceof Diagram) {

+				containerVisualID = CompositeStructureDiagramEditPart.VISUAL_ID;

+			} else {

+				return false;

+			}

+		}

+		switch(containerVisualID) {

+		case CompositeStructureDiagramEditPart.VISUAL_ID:

+			if(ActivityCompositeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionCompositeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ProtocolStateMachineCompositeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(StateMachineCompositeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(FunctionBehaviorCompositeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(OpaqueBehaviorCompositeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ComponentCompositeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeviceCompositeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ExecutionEnvironmentCompositeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(NodeCompositeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ClassCompositeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationCompositeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InterfaceEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PrimitiveTypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(EnumerationEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DataTypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActorEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeploymentSpecificationEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ArtifactEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InformationItemEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(SignalEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(UseCaseEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(SignalEventEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CallEventEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(AnyReceiveEventEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ChangeEventEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeEventEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationObservationEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeObservationEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(LiteralBooleanEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(LiteralIntegerEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(LiteralNullEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(LiteralStringEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(LiteralUnlimitedNaturalEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(StringExpressionEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(OpaqueExpressionEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeExpressionEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ExpressionEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeIntervalEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationIntervalEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InstanceValueEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CommentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationConstraintEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeConstraintEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalConstraintEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionConstraintEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConstraintEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ActivityCompositeEditPart.VISUAL_ID:

+			if(ActivityCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActivityCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case InteractionCompositeEditPart.VISUAL_ID:

+			if(InteractionCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ProtocolStateMachineCompositeEditPart.VISUAL_ID:

+			if(ProtocolStateMachineCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case StateMachineCompositeEditPart.VISUAL_ID:

+			if(StateMachineCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(StateMachineCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case FunctionBehaviorCompositeEditPart.VISUAL_ID:

+			if(FunctionBehaviorCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case OpaqueBehaviorCompositeEditPart.VISUAL_ID:

+			if(OpaqueBehaviorCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ComponentCompositeEditPart.VISUAL_ID:

+			if(ComponentCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ComponentCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case DeviceCompositeEditPart.VISUAL_ID:

+			if(DeviceCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeviceCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ExecutionEnvironmentCompositeEditPart.VISUAL_ID:

+			if(ExecutionEnvironmentCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case NodeCompositeEditPart.VISUAL_ID:

+			if(NodeCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(NodeCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ClassCompositeEditPart.VISUAL_ID:

+			if(ClassCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ClassCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CollaborationCompositeEditPart.VISUAL_ID:

+			if(CollaborationCompositeNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationCompositeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case InterfaceEditPart.VISUAL_ID:

+			if(InterfaceNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case PrimitiveTypeEditPart.VISUAL_ID:

+			if(PrimitiveTypeNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case EnumerationEditPart.VISUAL_ID:

+			if(EnumerationNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(EnumerationLiteralEditPartCLN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case DataTypeEditPart.VISUAL_ID:

+			if(DataTypeNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DataTypeAttributeCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DataTypeOperationCompartmentEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ActorEditPart.VISUAL_ID:

+			if(ActorNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case DeploymentSpecificationEditPart.VISUAL_ID:

+			if(DeploymentSpecificationNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ArtifactEditPart.VISUAL_ID:

+			if(ArtifactNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case InformationItemEditPart.VISUAL_ID:

+			if(InformationItemNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SignalEditPart.VISUAL_ID:

+			if(SignalNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case UseCaseEditPart.VISUAL_ID:

+			if(UseCaseNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SignalEventEditPart.VISUAL_ID:

+			if(SignalEventNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CallEventEditPart.VISUAL_ID:

+			if(CallEventNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case AnyReceiveEventEditPart.VISUAL_ID:

+			if(AnyReceiveEventNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ChangeEventEditPart.VISUAL_ID:

+			if(ChangeEventNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case TimeEventEditPart.VISUAL_ID:

+			if(TimeEventNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case DurationObservationEditPart.VISUAL_ID:

+			if(DurationObservationNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationObservationStereotypeLabelEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case TimeObservationEditPart.VISUAL_ID:

+			if(TimeObservationNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeObservationStereotypeLabelEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case LiteralBooleanEditPart.VISUAL_ID:

+			if(LiteralBooleanNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case LiteralIntegerEditPart.VISUAL_ID:

+			if(LiteralIntegerNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case LiteralNullEditPart.VISUAL_ID:

+			if(LiteralNullNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case LiteralStringEditPart.VISUAL_ID:

+			if(LiteralStringNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case LiteralUnlimitedNaturalEditPart.VISUAL_ID:

+			if(LiteralUnlimitedNaturalNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case StringExpressionEditPart.VISUAL_ID:

+			if(StringExpressionNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case OpaqueExpressionEditPart.VISUAL_ID:

+			if(OpaqueExpressionNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case TimeExpressionEditPart.VISUAL_ID:

+			if(TimeExpressionNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ExpressionEditPart.VISUAL_ID:

+			if(ExpressionNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case DurationEditPart.VISUAL_ID:

+			if(DurationNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case TimeIntervalEditPart.VISUAL_ID:

+			if(TimeIntervalNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case DurationIntervalEditPart.VISUAL_ID:

+			if(DurationIntervalNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case IntervalEditPart.VISUAL_ID:

+			if(IntervalNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case InstanceValueEditPart.VISUAL_ID:

+			if(InstanceValueNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CommentEditPart.VISUAL_ID:

+			if(CommentBodyEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case DurationConstraintEditPart.VISUAL_ID:

+			if(DurationConstraintNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationConstraintSpecificationEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case TimeConstraintEditPart.VISUAL_ID:

+			if(TimeConstraintNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeConstraintSpecificationEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case IntervalConstraintEditPart.VISUAL_ID:

+			if(IntervalConstraintNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalConstraintSpecificationEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case InteractionConstraintEditPart.VISUAL_ID:

+			if(InteractionConstraintNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionConstraintSpecificationEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConstraintEditPart.VISUAL_ID:

+			if(ConstraintNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConstraintSpecificationEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case PortEditPart.VISUAL_ID:

+			if(PortNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PortAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ParameterEditPart.VISUAL_ID:

+			if(ParameterNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ParameterAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case PropertyPartEditPartCN.VISUAL_ID:

+			if(PropertyPartNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PropertyPartCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CollaborationRoleEditPartCN.VISUAL_ID:

+			if(CollaborationRoleNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CollaborationUseEditPartCN.VISUAL_ID:

+			if(CollaborationUseNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ActivityCompositeEditPartCN.VISUAL_ID:

+			if(ActivityCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActivityCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case InteractionCompositeEditPartCN.VISUAL_ID:

+			if(InteractionCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ProtocolStateMachineCompositeEditPartCN.VISUAL_ID:

+			if(ProtocolStateMachineCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case StateMachineCompositeEditPartCN.VISUAL_ID:

+			if(StateMachineCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(StateMachineCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case FunctionBehaviorCompositeEditPartCN.VISUAL_ID:

+			if(FunctionBehaviorCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case OpaqueBehaviorCompositeEditPartCN.VISUAL_ID:

+			if(OpaqueBehaviorCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ComponentCompositeEditPartCN.VISUAL_ID:

+			if(ComponentCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ComponentCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case DeviceCompositeEditPartCN.VISUAL_ID:

+			if(DeviceCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeviceCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID:

+			if(ExecutionEnvironmentCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case NodeCompositeEditPartCN.VISUAL_ID:

+			if(NodeCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(NodeCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ClassCompositeEditPartCN.VISUAL_ID:

+			if(ClassCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ClassCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CollaborationCompositeEditPartCN.VISUAL_ID:

+			if(CollaborationCompositeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationCompositeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case InterfaceEditPartCN.VISUAL_ID:

+			if(InterfaceNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case PrimitiveTypeEditPartCN.VISUAL_ID:

+			if(PrimitiveTypeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case EnumerationEditPartCN.VISUAL_ID:

+			if(EnumerationNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(EnumerationLiteralEditPartCLN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case DataTypeEditPartCN.VISUAL_ID:

+			if(DataTypeNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DataTypeAttributeCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DataTypeOperationCompartmentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ActorEditPartCN.VISUAL_ID:

+			if(ActorNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case DeploymentSpecificationEditPartCN.VISUAL_ID:

+			if(DeploymentSpecificationNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ArtifactEditPartCN.VISUAL_ID:

+			if(ArtifactNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case InformationItemEditPartCN.VISUAL_ID:

+			if(InformationItemNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SignalEditPartCN.VISUAL_ID:

+			if(SignalNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case UseCaseEditPartCN.VISUAL_ID:

+			if(UseCaseNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CommentEditPartCN.VISUAL_ID:

+			if(CommentBodyEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case DurationConstraintEditPartCN.VISUAL_ID:

+			if(DurationConstraintNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationConstraintSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case TimeConstraintEditPartCN.VISUAL_ID:

+			if(TimeConstraintNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeConstraintSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case IntervalConstraintEditPartCN.VISUAL_ID:

+			if(IntervalConstraintNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalConstraintSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case InteractionConstraintEditPartCN.VISUAL_ID:

+			if(InteractionConstraintNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionConstraintSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConstraintEditPartCN.VISUAL_ID:

+			if(ConstraintNameEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConstraintSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case DataTypeAttributeCompartmentEditPart.VISUAL_ID:

+			if(PropertyEditPartCLN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case DataTypeOperationCompartmentEditPart.VISUAL_ID:

+			if(OperationEditPartCLN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case DataTypeAttributeCompartmentEditPartCN.VISUAL_ID:

+			if(PropertyEditPartCLN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case DataTypeOperationCompartmentEditPartCN.VISUAL_ID:

+			if(OperationEditPartCLN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID:

+			if(EnumerationLiteralEditPartCLN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID:

+			if(EnumerationLiteralEditPartCLN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ActivityCompositeCompartmentEditPartCN.VISUAL_ID:

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case InteractionCompositeCompartmentEditPartCN.VISUAL_ID:

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID:

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case StateMachineCompositeCompartmentEditPartCN.VISUAL_ID:

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ComponentCompositeCompartmentEditPartCN.VISUAL_ID:

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case DeviceCompositeCompartmentEditPartCN.VISUAL_ID:

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID:

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case NodeCompositeCompartmentEditPartCN.VISUAL_ID:

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ClassCompositeCompartmentEditPartCN.VISUAL_ID:

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(BehaviorPortEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CollaborationCompositeCompartmentEditPartCN.VISUAL_ID:

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationRoleEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ActivityCompositeCompartmentEditPart.VISUAL_ID:

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case InteractionCompositeCompartmentEditPart.VISUAL_ID:

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID:

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case StateMachineCompositeCompartmentEditPart.VISUAL_ID:

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID:

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID:

+			if(ParameterEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ComponentCompositeCompartmentEditPart.VISUAL_ID:

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case DeviceCompositeCompartmentEditPart.VISUAL_ID:

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID:

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case NodeCompositeCompartmentEditPart.VISUAL_ID:

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ClassCompositeCompartmentEditPart.VISUAL_ID:

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActivityCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(StateMachineCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(FunctionBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ComponentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeviceCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(NodeCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ClassCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationCompositeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InterfaceEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(PrimitiveTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(EnumerationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DataTypeEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ActorEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeploymentSpecificationEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ArtifactEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InformationItemEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(SignalEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(UseCaseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case CollaborationCompositeCompartmentEditPart.VISUAL_ID:

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationUseEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CollaborationRoleEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DurationConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(TimeConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(IntervalConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InteractionConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConstraintEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case PropertyPartCompartmentEditPartCN.VISUAL_ID:

+			if(PropertyPartEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(CommentEditPartCN.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ComponentRealizationEditPart.VISUAL_ID:

+			if(ComponentRealizationNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case InterfaceRealizationEditPart.VISUAL_ID:

+			if(InterfaceRealizationNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case SubstitutionEditPart.VISUAL_ID:

+			if(SubstitutionNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(SubstitutionAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case RealizationEditPart.VISUAL_ID:

+			if(RealizationNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(RealizationAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ManifestationEditPart.VISUAL_ID:

+			if(ManifestationNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ManifestationAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case AbstractionEditPart.VISUAL_ID:

+			if(AbstractionNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(AbstractionAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case UsageEditPart.VISUAL_ID:

+			if(UsageNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(UsageAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case DeploymentEditPart.VISUAL_ID:

+			if(DeploymentNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DeploymentAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case RoleBindingEditPart.VISUAL_ID:

+			if(RoleBindingRoleNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(RoleBindingAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case DependencyEditPart.VISUAL_ID:

+			if(DependencyNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(DependencyAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case ConnectorEditPart.VISUAL_ID:

+			if(ConnectorAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConnectorNameEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConnectorMultiplicitySourceEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(ConnectorMultiplicityTargetEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case GeneralizationEditPart.VISUAL_ID:

+			if(GeneralizationAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case RepresentationEditPart.VISUAL_ID:

+			if(RepresentationTagLabelEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		case InformationFlowEditPart.VISUAL_ID:

+			if(InformationFlowConveyedLabelEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			if(InformationFlowAppliedStereotypeEditPart.VISUAL_ID == nodeVisualID) {

+				return true;

+			}

+			break;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static int getLinkWithClassVisualID(EObject domainElement) {

+		if(domainElement == null) {

+			return -1;

+		}

+		if(UMLPackage.eINSTANCE.getComponentRealization().isSuperTypeOf(domainElement.eClass())) {

+			return ComponentRealizationEditPart.VISUAL_ID;

+		}

+		if(UMLPackage.eINSTANCE.getInterfaceRealization().isSuperTypeOf(domainElement.eClass())) {

+			return InterfaceRealizationEditPart.VISUAL_ID;

+		}

+		if(UMLPackage.eINSTANCE.getSubstitution().isSuperTypeOf(domainElement.eClass())) {

+			return SubstitutionEditPart.VISUAL_ID;

+		}

+		if(UMLPackage.eINSTANCE.getRealization().isSuperTypeOf(domainElement.eClass())) {

+			return RealizationEditPart.VISUAL_ID;

+		}

+		if(UMLPackage.eINSTANCE.getManifestation().isSuperTypeOf(domainElement.eClass())) {

+			return ManifestationEditPart.VISUAL_ID;

+		}

+		if(UMLPackage.eINSTANCE.getAbstraction().isSuperTypeOf(domainElement.eClass())) {

+			return AbstractionEditPart.VISUAL_ID;

+		}

+		if(UMLPackage.eINSTANCE.getUsage().isSuperTypeOf(domainElement.eClass())) {

+			return UsageEditPart.VISUAL_ID;

+		}

+		if(UMLPackage.eINSTANCE.getDeployment().isSuperTypeOf(domainElement.eClass())) {

+			return DeploymentEditPart.VISUAL_ID;

+		}

+		if(UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass()) && isDependency_4017((Dependency)domainElement)) {

+			return RoleBindingEditPart.VISUAL_ID;

+		}

+		if(UMLPackage.eINSTANCE.getDependency().isSuperTypeOf(domainElement.eClass()) && isDependency_4010((Dependency)domainElement)) {

+			return DependencyEditPart.VISUAL_ID;

+		}

+		if(UMLPackage.eINSTANCE.getConnector().isSuperTypeOf(domainElement.eClass())) {

+			return ConnectorEditPart.VISUAL_ID;

+		}

+		if(UMLPackage.eINSTANCE.getGeneralization().isSuperTypeOf(domainElement.eClass())) {

+			return GeneralizationEditPart.VISUAL_ID;

+		}

+		if(UMLPackage.eINSTANCE.getInformationFlow().isSuperTypeOf(domainElement.eClass())) {

+			return InformationFlowEditPart.VISUAL_ID;

+		}

+		return -1;

+	}

+

+	/**

+	 * User can change implementation of this method to handle some specific

+	 * situations not covered by default logic.

+	 * 

+	 * @generated

+	 */

+	private static boolean isDiagram(Package element) {

+		return true;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static boolean isProperty_3070(View containerView, Property domainElement) {

+		// Property / CollaborationRole constraint		

+		// Restriction for the case where domainElement owner is a Collaboration

+		// If the domainElement is not referenced as one of its owner role

+		// then it should be considered as a Property creation on Collaboration,

+		// else the test should return false and be considered as a representation of

+		// a collaboration role (ConnectableElement).

+		if(containerView.getElement() instanceof Collaboration) {

+			Collaboration graphicalParent = (Collaboration)containerView.getElement();

+			if(graphicalParent.getCollaborationRoles().contains(domainElement)) {

+				return false;

+			}

+		}

+

+		// General case : no restriction

+		return true;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static boolean isDependency_4017(Dependency domainElement) {

+		// Test if the dependency is a RoleBinding

+		if(domainElement.getOwner() instanceof CollaborationUse) {

+			CollaborationUse owner = (CollaborationUse)domainElement.getOwner();

+			if(owner.getRoleBindings().contains(domainElement)) {

+				return true;

+			}

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static boolean isDependency_4010(Dependency domainElement) {

+		// Test if the dependency is not a RoleBinding

+		if(domainElement.getOwner() instanceof CollaborationUse) {

+			CollaborationUse owner = (CollaborationUse)domainElement.getOwner();

+			if(owner.getRoleBindings().contains(domainElement)) {

+				return false;

+			}

+		}

+		return true;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static boolean checkNodeVisualID(View containerView, EObject domainElement, int candidate) {

+		if(candidate == -1) {

+			//unrecognized id is always bad

+			return false;

+		}

+		int basic = getNodeVisualID(containerView, domainElement);

+		return basic == candidate;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static boolean isCompartmentVisualID(int visualID) {

+		switch(visualID) {

+		case DataTypeAttributeCompartmentEditPart.VISUAL_ID:

+		case DataTypeOperationCompartmentEditPart.VISUAL_ID:

+		case DataTypeAttributeCompartmentEditPartCN.VISUAL_ID:

+		case DataTypeOperationCompartmentEditPartCN.VISUAL_ID:

+		case EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID:

+		case EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID:

+		case ActivityCompositeCompartmentEditPartCN.VISUAL_ID:

+		case InteractionCompositeCompartmentEditPartCN.VISUAL_ID:

+		case ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID:

+		case StateMachineCompositeCompartmentEditPartCN.VISUAL_ID:

+		case FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:

+		case OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID:

+		case ComponentCompositeCompartmentEditPartCN.VISUAL_ID:

+		case DeviceCompositeCompartmentEditPartCN.VISUAL_ID:

+		case ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID:

+		case NodeCompositeCompartmentEditPartCN.VISUAL_ID:

+		case ClassCompositeCompartmentEditPartCN.VISUAL_ID:

+		case CollaborationCompositeCompartmentEditPartCN.VISUAL_ID:

+		case ActivityCompositeCompartmentEditPart.VISUAL_ID:

+		case InteractionCompositeCompartmentEditPart.VISUAL_ID:

+		case ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID:

+		case StateMachineCompositeCompartmentEditPart.VISUAL_ID:

+		case FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID:

+		case OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID:

+		case ComponentCompositeCompartmentEditPart.VISUAL_ID:

+		case DeviceCompositeCompartmentEditPart.VISUAL_ID:

+		case ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID:

+		case NodeCompositeCompartmentEditPart.VISUAL_ID:

+		case ClassCompositeCompartmentEditPart.VISUAL_ID:

+		case CollaborationCompositeCompartmentEditPart.VISUAL_ID:

+		case PropertyPartCompartmentEditPartCN.VISUAL_ID:

+			return true;

+		default:

+			break;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static boolean isSemanticLeafVisualID(int visualID) {

+		switch(visualID) {

+		case CompositeStructureDiagramEditPart.VISUAL_ID:

+			return false;

+		case PrimitiveTypeEditPart.VISUAL_ID:

+		case InterfaceEditPart.VISUAL_ID:

+		case ActorEditPart.VISUAL_ID:

+		case DeploymentSpecificationEditPart.VISUAL_ID:

+		case ArtifactEditPart.VISUAL_ID:

+		case InformationItemEditPart.VISUAL_ID:

+		case SignalEditPart.VISUAL_ID:

+		case UseCaseEditPart.VISUAL_ID:

+		case SignalEventEditPart.VISUAL_ID:

+		case CallEventEditPart.VISUAL_ID:

+		case AnyReceiveEventEditPart.VISUAL_ID:

+		case ChangeEventEditPart.VISUAL_ID:

+		case TimeEventEditPart.VISUAL_ID:

+		case DurationObservationEditPart.VISUAL_ID:

+		case TimeObservationEditPart.VISUAL_ID:

+		case LiteralBooleanEditPart.VISUAL_ID:

+		case LiteralIntegerEditPart.VISUAL_ID:

+		case LiteralNullEditPart.VISUAL_ID:

+		case LiteralStringEditPart.VISUAL_ID:

+		case LiteralUnlimitedNaturalEditPart.VISUAL_ID:

+		case StringExpressionEditPart.VISUAL_ID:

+		case OpaqueExpressionEditPart.VISUAL_ID:

+		case TimeExpressionEditPart.VISUAL_ID:

+		case ExpressionEditPart.VISUAL_ID:

+		case DurationEditPart.VISUAL_ID:

+		case TimeIntervalEditPart.VISUAL_ID:

+		case DurationIntervalEditPart.VISUAL_ID:

+		case IntervalEditPart.VISUAL_ID:

+		case InstanceValueEditPart.VISUAL_ID:

+		case CommentEditPart.VISUAL_ID:

+		case DurationConstraintEditPart.VISUAL_ID:

+		case TimeConstraintEditPart.VISUAL_ID:

+		case IntervalConstraintEditPart.VISUAL_ID:

+		case InteractionConstraintEditPart.VISUAL_ID:

+		case ConstraintEditPart.VISUAL_ID:

+		case EnumerationLiteralEditPartCLN.VISUAL_ID:

+		case PortEditPart.VISUAL_ID:

+		case CollaborationUseEditPartCN.VISUAL_ID:

+		case PrimitiveTypeEditPartCN.VISUAL_ID:

+		case InterfaceEditPartCN.VISUAL_ID:

+		case ParameterEditPart.VISUAL_ID:

+		case ActorEditPartCN.VISUAL_ID:

+		case DeploymentSpecificationEditPartCN.VISUAL_ID:

+		case ArtifactEditPartCN.VISUAL_ID:

+		case InformationItemEditPartCN.VISUAL_ID:

+		case SignalEditPartCN.VISUAL_ID:

+		case UseCaseEditPartCN.VISUAL_ID:

+		case CommentEditPartCN.VISUAL_ID:

+		case PropertyEditPartCLN.VISUAL_ID:

+		case OperationEditPartCLN.VISUAL_ID:

+		case CollaborationRoleEditPartCN.VISUAL_ID:

+		case DurationConstraintEditPartCN.VISUAL_ID:

+		case TimeConstraintEditPartCN.VISUAL_ID:

+		case IntervalConstraintEditPartCN.VISUAL_ID:

+		case InteractionConstraintEditPartCN.VISUAL_ID:

+		case ConstraintEditPartCN.VISUAL_ID:

+		case BehaviorPortEditPart.VISUAL_ID:

+			return true;

+		default:

+			break;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static final DiagramStructure TYPED_INSTANCE = new DiagramStructure() {

+

+		/**

+		 * @generated

+		 */

+		@Override

+		public int getVisualID(View view) {

+			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getVisualID(view);

+		}

+

+		/**

+		 * @generated

+		 */

+		@Override

+		public String getModelID(View view) {

+			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getModelID(view);

+		}

+

+		/**

+		 * @generated

+		 */

+		@Override

+		public int getNodeVisualID(View containerView, EObject domainElement) {

+			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.getNodeVisualID(containerView, domainElement);

+		}

+

+		/**

+		 * @generated

+		 */

+		@Override

+		public boolean checkNodeVisualID(View containerView, EObject domainElement, int candidate) {

+			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.checkNodeVisualID(containerView, domainElement, candidate);

+		}

+

+		/**

+		 * @generated

+		 */

+		@Override

+		public boolean isCompartmentVisualID(int visualID) {

+			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.isCompartmentVisualID(visualID);

+		}

+

+		/**

+		 * @generated

+		 */

+		@Override

+		public boolean isSemanticLeafVisualID(int visualID) {

+			return org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry.isSemanticLeafVisualID(visualID);

+		}

+	};

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/ValidateAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/ValidateAction.java
index e8ffaeda92a..b41ae002964 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/ValidateAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/ValidateAction.java
@@ -1,299 +1,269 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.part;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.Diagnostician;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.emf.validation.model.EvaluationMode;
-import org.eclipse.emf.validation.model.IConstraintStatus;
-import org.eclipse.emf.validation.service.IBatchValidator;
-import org.eclipse.emf.validation.service.ModelValidationService;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gmf.runtime.diagram.ui.OffscreenEditPartFactory;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLMarkerNavigationProvider;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLValidationProvider;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation;
-
-/**
- * @generated
- */
-public class ValidateAction extends Action {
-	/**
-	 * @generated
-	 */
-	private IWorkbenchPage page;
-
-	/**
-	 * @generated
-	 */
-	public ValidateAction(IWorkbenchPage page) {
-		setText(Messages.ValidateActionMessage);
-		this.page = page;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void run() {
-		IWorkbenchPart workbenchPart = page.getActivePart();
-		if (workbenchPart instanceof IDiagramWorkbenchPart) {
-			final IDiagramWorkbenchPart part = (IDiagramWorkbenchPart) workbenchPart;
-			try {
-				new WorkspaceModifyDelegatingOperation(
-						new IRunnableWithProgress() {
-							public void run(IProgressMonitor monitor)
-									throws InterruptedException, InvocationTargetException {
-								runValidation(part.getDiagramEditPart(), part.getDiagram());
-							}
-						})
-						.run(new NullProgressMonitor());
-			} catch (Exception e) {
-				UMLDiagramEditorPlugin.getInstance().logError("Validation action failed", e); //$NON-NLS-1$
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void runValidation(View view) {
-		try {
-			if (UMLDiagramEditorUtil.openDiagram(view.eResource())) {
-				IEditorPart editorPart = PlatformUI.getWorkbench()
-						.getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-				if (editorPart instanceof IDiagramWorkbenchPart) {
-					runValidation(((IDiagramWorkbenchPart) editorPart).
-							getDiagramEditPart(), view);
-				} else {
-					runNonUIValidation(view);
-				}
-			}
-		} catch (Exception e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Validation action failed", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void runNonUIValidation(View view) {
-		Shell shell = Display.getCurrent().getActiveShell();
-		if (shell == null) {
-			shell = new Shell();
-		}
-		DiagramEditPart diagramEditPart =
-				OffscreenEditPartFactory.getInstance().createDiagramEditPart(
-						view.getDiagram(), shell);
-		runValidation(diagramEditPart, view);
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void runValidation(DiagramEditPart diagramEditPart, View view) {
-		final DiagramEditPart fpart = diagramEditPart;
-		final View fview = view;
-		TransactionalEditingDomain txDomain = TransactionUtil.getEditingDomain(view);
-		UMLValidationProvider.runWithConstraints(txDomain, new Runnable() {
-			public void run() {
-				validate(fpart, fview);
-			}
-		});
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Diagnostic runEMFValidator(
-			View target) {
-		if (target.isSetElement() && target.getElement() != null) {
-			return new Diagnostician() {
-				public String getObjectLabel(EObject eObject) {
-					return EMFCoreUtil.getQualifiedName(eObject, true);
-				}
-			}.validate(target.getElement());
-		}
-		return Diagnostic.OK_INSTANCE;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static void validate(DiagramEditPart diagramEditPart,
-			View view) {
-		IFile target = view.eResource() != null ?
-				WorkspaceSynchronizer.getFile(view.eResource()) : null;
-		if (target != null) {
-			UMLMarkerNavigationProvider.deleteMarkers(target);
-		}
-		Diagnostic diagnostic = runEMFValidator(view);
-		createMarkers(target, diagnostic, diagramEditPart);
-		IBatchValidator validator =
-				(IBatchValidator)
-				ModelValidationService.getInstance().newValidator(
-						EvaluationMode.BATCH);
-		validator.setIncludeLiveConstraints(true);
-		if (view.isSetElement() && view.getElement() != null) {
-			IStatus status = validator.validate(view.getElement());
-			createMarkers(target, status, diagramEditPart);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static void createMarkers(
-			IFile
-			target, IStatus validationStatus, DiagramEditPart diagramEditPart) {
-		if (validationStatus.isOK()) {
-			return;
-		}
-		final IStatus rootStatus = validationStatus;
-		List allStatuses = new ArrayList();
-		UMLDiagramEditorUtil.LazyElement2ViewMap element2ViewMap = new UMLDiagramEditorUtil.LazyElement2ViewMap(
-				diagramEditPart.getDiagramView(),
-				collectTargetElements(rootStatus, new HashSet<EObject>(), allStatuses));
-		for (Iterator it = allStatuses.iterator(); it.hasNext();) {
-			IConstraintStatus nextStatus =
-					(IConstraintStatus) it.next();
-			View view = UMLDiagramEditorUtil.findView(
-					diagramEditPart, nextStatus.getTarget(), element2ViewMap);
-			addMarker(diagramEditPart.getViewer(), target, view.eResource().getURIFragment(view),
-					EMFCoreUtil.getQualifiedName(nextStatus.getTarget(), true),
-					nextStatus.getMessage(), nextStatus.getSeverity());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static void createMarkers(
-			IFile
-			target, Diagnostic emfValidationStatus, DiagramEditPart diagramEditPart) {
-		if (emfValidationStatus.getSeverity() == Diagnostic.OK) {
-			return;
-		}
-		final Diagnostic rootStatus = emfValidationStatus;
-		List<Diagnostic> allDiagnostics = new ArrayList<Diagnostic>();
-		UMLDiagramEditorUtil.LazyElement2ViewMap element2ViewMap =
-				new UMLDiagramEditorUtil.LazyElement2ViewMap(
-						diagramEditPart.getDiagramView(),
-						collectTargetElements(rootStatus, new HashSet<EObject>(), allDiagnostics));
-		for (Iterator<Diagnostic> it = emfValidationStatus.getChildren().iterator(); it.hasNext();) {
-			Diagnostic nextDiagnostic = (Diagnostic) it.next();
-			List<?> data = nextDiagnostic.getData();
-			if (data != null && !data.isEmpty() && data.get(0) instanceof EObject) {
-				EObject element = (EObject) data.get(0);
-				View view = UMLDiagramEditorUtil.findView(
-						diagramEditPart, element, element2ViewMap);
-				addMarker(diagramEditPart.getViewer(), target, view.eResource().getURIFragment(view),
-						EMFCoreUtil.getQualifiedName(element, true),
-						nextDiagnostic.getMessage(), diagnosticToStatusSeverity(nextDiagnostic.getSeverity()));
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private static void addMarker(EditPartViewer viewer, IFile
-			target, String elementId, String location, String message, int statusSeverity) {
-		if (target == null) {
-			return;
-		}
-		UMLMarkerNavigationProvider.addMarker(
-				target, elementId, location, message, statusSeverity);
-	}
-
-	/**
-	 * @generated
-	 */
-	private static int diagnosticToStatusSeverity(int diagnosticSeverity) {
-		if (diagnosticSeverity == Diagnostic.OK) {
-			return IStatus.OK;
-		} else if (diagnosticSeverity == Diagnostic.INFO) {
-			return IStatus.INFO;
-		} else if (diagnosticSeverity == Diagnostic.WARNING) {
-			return IStatus.WARNING;
-		} else if (diagnosticSeverity == Diagnostic.ERROR
-				|| diagnosticSeverity == Diagnostic.CANCEL) {
-			return IStatus.ERROR;
-		}
-		return IStatus.INFO;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Set<EObject> collectTargetElements(IStatus status,
-			Set<EObject> targetElementCollector, List<IConstraintStatus> allConstraintStatuses) {
-		if (status instanceof IConstraintStatus) {
-			targetElementCollector.add(((IConstraintStatus) status).getTarget());
-			allConstraintStatuses.add((IConstraintStatus) status);
-		}
-		if (status.isMultiStatus()) {
-			IStatus[] children = status.getChildren();
-			for (int i = 0; i < children.length; i++) {
-				collectTargetElements(children[i], targetElementCollector, allConstraintStatuses);
-			}
-		}
-		return targetElementCollector;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Set<EObject> collectTargetElements(Diagnostic diagnostic,
-			Set<EObject> targetElementCollector, List<Diagnostic> allDiagnostics) {
-		List<?> data = diagnostic.getData();
-		EObject target = null;
-		if (data != null && !data.isEmpty() && data.get(0) instanceof EObject) {
-			target = (EObject) data.get(0);
-			targetElementCollector.add(target);
-			allDiagnostics.add(diagnostic);
-		}
-		if (diagnostic.getChildren() != null && !diagnostic.getChildren().isEmpty()) {
-			for (Iterator<Diagnostic> it = diagnostic.getChildren().iterator(); it.hasNext();) {
-				collectTargetElements((Diagnostic) it.next(),
-						targetElementCollector, allDiagnostics);
-			}
-		}
-		return targetElementCollector;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.part;

+

+import java.lang.reflect.InvocationTargetException;

+import java.util.ArrayList;

+import java.util.HashSet;

+import java.util.Iterator;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.NullProgressMonitor;

+import org.eclipse.emf.common.util.Diagnostic;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.util.Diagnostician;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.emf.transaction.util.TransactionUtil;

+import org.eclipse.emf.validation.model.EvaluationMode;

+import org.eclipse.emf.validation.model.IConstraintStatus;

+import org.eclipse.emf.validation.service.IBatchValidator;

+import org.eclipse.emf.validation.service.ModelValidationService;

+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;

+import org.eclipse.gef.EditPartViewer;

+import org.eclipse.gmf.runtime.diagram.ui.OffscreenEditPartFactory;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;

+import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.action.Action;

+import org.eclipse.jface.operation.IRunnableWithProgress;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLMarkerNavigationProvider;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLValidationProvider;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.ui.IEditorPart;

+import org.eclipse.ui.IWorkbenchPage;

+import org.eclipse.ui.IWorkbenchPart;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation;

+

+/**

+ * @generated

+ */

+public class ValidateAction extends Action {

+

+	/**

+	 * @generated

+	 */

+	private IWorkbenchPage page;

+

+	/**

+	 * @generated

+	 */

+	public ValidateAction(IWorkbenchPage page) {

+		setText(Messages.ValidateActionMessage);

+		this.page = page;

+	}

+

+	/**

+	 * @generated

+	 */

+	public void run() {

+		IWorkbenchPart workbenchPart = page.getActivePart();

+		if(workbenchPart instanceof IDiagramWorkbenchPart) {

+			final IDiagramWorkbenchPart part = (IDiagramWorkbenchPart)workbenchPart;

+			try {

+				new WorkspaceModifyDelegatingOperation(new IRunnableWithProgress() {

+

+					public void run(IProgressMonitor monitor) throws InterruptedException, InvocationTargetException {

+						runValidation(part.getDiagramEditPart(), part.getDiagram());

+					}

+				}).run(new NullProgressMonitor());

+			} catch (Exception e) {

+				UMLDiagramEditorPlugin.getInstance().logError("Validation action failed", e); //$NON-NLS-1$

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public static void runValidation(View view) {

+		try {

+			if(UMLDiagramEditorUtil.openDiagram(view.eResource())) {

+				IEditorPart editorPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();

+				if(editorPart instanceof IDiagramWorkbenchPart) {

+					runValidation(((IDiagramWorkbenchPart)editorPart).getDiagramEditPart(), view);

+				} else {

+					runNonUIValidation(view);

+				}

+			}

+		} catch (Exception e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Validation action failed", e); //$NON-NLS-1$

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public static void runNonUIValidation(View view) {

+		Shell shell = Display.getCurrent().getActiveShell();

+		if(shell == null) {

+			shell = new Shell();

+		}

+

+		DiagramEditPart diagramEditPart = OffscreenEditPartFactory.getInstance().createDiagramEditPart(view.getDiagram(), shell);

+		runValidation(diagramEditPart, view);

+	}

+

+	/**

+	 * @generated

+	 */

+	public static void runValidation(DiagramEditPart diagramEditPart, View view) {

+		final DiagramEditPart fpart = diagramEditPart;

+		final View fview = view;

+		TransactionalEditingDomain txDomain = TransactionUtil.getEditingDomain(view);

+		UMLValidationProvider.runWithConstraints(txDomain, new Runnable() {

+

+			public void run() {

+				validate(fpart, fview);

+			}

+		});

+	}

+

+	/**

+	 * @generated

+	 */

+	private static Diagnostic runEMFValidator(View target) {

+		if(target.isSetElement() && target.getElement() != null) {

+			return new Diagnostician() {

+

+				public String getObjectLabel(EObject eObject) {

+					return EMFCoreUtil.getQualifiedName(eObject, true);

+				}

+			}.validate(target.getElement());

+		}

+		return Diagnostic.OK_INSTANCE;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static void validate(DiagramEditPart diagramEditPart, View view) {

+		IFile target = view.eResource() != null ? WorkspaceSynchronizer.getFile(view.eResource()) : null;

+		if(target != null) {

+			UMLMarkerNavigationProvider.deleteMarkers(target);

+		}

+		Diagnostic diagnostic = runEMFValidator(view);

+		createMarkers(target, diagnostic, diagramEditPart);

+		IBatchValidator validator = (IBatchValidator)ModelValidationService.getInstance().newValidator(EvaluationMode.BATCH);

+		validator.setIncludeLiveConstraints(true);

+		if(view.isSetElement() && view.getElement() != null) {

+			IStatus status = validator.validate(view.getElement());

+			createMarkers(target, status, diagramEditPart);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private static void createMarkers(IFile target, IStatus validationStatus, DiagramEditPart diagramEditPart) {

+		if(validationStatus.isOK()) {

+			return;

+		}

+		final IStatus rootStatus = validationStatus;

+		List allStatuses = new ArrayList();

+		UMLDiagramEditorUtil.LazyElement2ViewMap element2ViewMap = new UMLDiagramEditorUtil.LazyElement2ViewMap(diagramEditPart.getDiagramView(), collectTargetElements(rootStatus, new HashSet<EObject>(), allStatuses));

+		for(Iterator it = allStatuses.iterator(); it.hasNext();) {

+			IConstraintStatus nextStatus = (IConstraintStatus)it.next();

+			View view = UMLDiagramEditorUtil.findView(diagramEditPart, nextStatus.getTarget(), element2ViewMap);

+			addMarker(diagramEditPart.getViewer(), target, view.eResource().getURIFragment(view), EMFCoreUtil.getQualifiedName(nextStatus.getTarget(), true), nextStatus.getMessage(), nextStatus.getSeverity());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private static void createMarkers(IFile target, Diagnostic emfValidationStatus, DiagramEditPart diagramEditPart) {

+		if(emfValidationStatus.getSeverity() == Diagnostic.OK) {

+			return;

+		}

+		final Diagnostic rootStatus = emfValidationStatus;

+		List<Diagnostic> allDiagnostics = new ArrayList<Diagnostic>();

+		UMLDiagramEditorUtil.LazyElement2ViewMap element2ViewMap = new UMLDiagramEditorUtil.LazyElement2ViewMap(diagramEditPart.getDiagramView(), collectTargetElements(rootStatus, new HashSet<EObject>(), allDiagnostics));

+		for(Iterator<Diagnostic> it = emfValidationStatus.getChildren().iterator(); it.hasNext();) {

+			Diagnostic nextDiagnostic = (Diagnostic)it.next();

+			List<?> data = nextDiagnostic.getData();

+			if(data != null && !data.isEmpty() && data.get(0) instanceof EObject) {

+				EObject element = (EObject)data.get(0);

+				View view = UMLDiagramEditorUtil.findView(diagramEditPart, element, element2ViewMap);

+				addMarker(diagramEditPart.getViewer(), target, view.eResource().getURIFragment(view), EMFCoreUtil.getQualifiedName(element, true), nextDiagnostic.getMessage(), diagnosticToStatusSeverity(nextDiagnostic.getSeverity()));

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private static void addMarker(EditPartViewer viewer, IFile target, String elementId, String location, String message, int statusSeverity) {

+		if(target == null) {

+			return;

+		}

+		UMLMarkerNavigationProvider.addMarker(target, elementId, location, message, statusSeverity);

+	}

+

+	/**

+	 * @generated

+	 */

+	private static int diagnosticToStatusSeverity(int diagnosticSeverity) {

+		if(diagnosticSeverity == Diagnostic.OK) {

+			return IStatus.OK;

+		} else if(diagnosticSeverity == Diagnostic.INFO) {

+			return IStatus.INFO;

+		} else if(diagnosticSeverity == Diagnostic.WARNING) {

+			return IStatus.WARNING;

+		} else if(diagnosticSeverity == Diagnostic.ERROR || diagnosticSeverity == Diagnostic.CANCEL) {

+			return IStatus.ERROR;

+		}

+		return IStatus.INFO;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static Set<EObject> collectTargetElements(IStatus status, Set<EObject> targetElementCollector, List<IConstraintStatus> allConstraintStatuses) {

+		if(status instanceof IConstraintStatus) {

+			targetElementCollector.add(((IConstraintStatus)status).getTarget());

+			allConstraintStatuses.add((IConstraintStatus)status);

+		}

+		if(status.isMultiStatus()) {

+			IStatus[] children = status.getChildren();

+			for(int i = 0; i < children.length; i++) {

+				collectTargetElements(children[i], targetElementCollector, allConstraintStatuses);

+			}

+		}

+		return targetElementCollector;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static Set<EObject> collectTargetElements(Diagnostic diagnostic, Set<EObject> targetElementCollector, List<Diagnostic> allDiagnostics) {

+		List<?> data = diagnostic.getData();

+		EObject target = null;

+		if(data != null && !data.isEmpty() && data.get(0) instanceof EObject) {

+			target = (EObject)data.get(0);

+			targetElementCollector.add(target);

+			allDiagnostics.add(diagnostic);

+		}

+		if(diagnostic.getChildren() != null && !diagnostic.getChildren().isEmpty()) {

+			for(Iterator<Diagnostic> it = diagnostic.getChildren().iterator(); it.hasNext();) {

+				collectTargetElements((Diagnostic)it.next(), targetElementCollector, allDiagnostics);

+			}

+		}

+		return targetElementCollector;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramAppearancePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramAppearancePreferencePage.java
index 0e5c60157ce..7598c57d08e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramAppearancePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramAppearancePreferencePage.java
@@ -1,28 +1,28 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.preferences;
-
-import org.eclipse.gmf.runtime.diagram.ui.preferences.AppearancePreferencePage;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class DiagramAppearancePreferencePage extends AppearancePreferencePage
-{
-	/**
-	 * @generated
-	 */
-	public DiagramAppearancePreferencePage() {
-		setPreferenceStore(UMLDiagramEditorPlugin.getInstance().getPreferenceStore());
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.preferences;

+

+import org.eclipse.gmf.runtime.diagram.ui.preferences.AppearancePreferencePage;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public class DiagramAppearancePreferencePage extends AppearancePreferencePage {

+

+	/**

+	 * @generated

+	 */

+	public DiagramAppearancePreferencePage() {

+		setPreferenceStore(UMLDiagramEditorPlugin.getInstance().getPreferenceStore());

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramConnectionsPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramConnectionsPreferencePage.java
index 6c2bab3d24a..6eb65b2edf2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramConnectionsPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramConnectionsPreferencePage.java
@@ -1,28 +1,28 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.preferences;
-
-import org.eclipse.gmf.runtime.diagram.ui.preferences.ConnectionsPreferencePage;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class DiagramConnectionsPreferencePage extends ConnectionsPreferencePage
-{
-	/**
-	 * @generated
-	 */
-	public DiagramConnectionsPreferencePage() {
-		setPreferenceStore(UMLDiagramEditorPlugin.getInstance().getPreferenceStore());
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.preferences;

+

+import org.eclipse.gmf.runtime.diagram.ui.preferences.ConnectionsPreferencePage;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public class DiagramConnectionsPreferencePage extends ConnectionsPreferencePage {

+

+	/**

+	 * @generated

+	 */

+	public DiagramConnectionsPreferencePage() {

+		setPreferenceStore(UMLDiagramEditorPlugin.getInstance().getPreferenceStore());

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramGeneralPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramGeneralPreferencePage.java
index f88e9d28fac..5fd97c2931a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramGeneralPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramGeneralPreferencePage.java
@@ -1,30 +1,30 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.preferences;
-
-import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.DiagramPreferencePage;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class DiagramGeneralPreferencePage extends DiagramPreferencePage
-{
-	/**
-	 * @generated
-	 */
-	public DiagramGeneralPreferencePage() {
-		setPreferenceStore(UMLDiagramEditorPlugin.getInstance().getPreferenceStore());
-		setPreferenceKey(CompositeStructureDiagramEditPart.MODEL_ID);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.preferences;

+

+import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.DiagramPreferencePage;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public class DiagramGeneralPreferencePage extends DiagramPreferencePage {

+

+	/**

+	 * @generated

+	 */

+	public DiagramGeneralPreferencePage() {

+		setPreferenceStore(UMLDiagramEditorPlugin.getInstance().getPreferenceStore());

+		setPreferenceKey(CompositeStructureDiagramEditPart.MODEL_ID);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramPreferenceInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramPreferenceInitializer.java
index 2893ecfe572..b10346d696c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramPreferenceInitializer.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramPreferenceInitializer.java
@@ -1,40 +1,42 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class DiagramPreferenceInitializer extends AbstractPreferenceInitializer {
-	/**
-	 * @generated
-	 */
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = getPreferenceStore();
-		DiagramGeneralPreferencePage.initDefaults(store);
-		DiagramAppearancePreferencePage.initDefaults(store);
-		DiagramConnectionsPreferencePage.initDefaults(store);
-		DiagramPrintingPreferencePage.initDefaults(store);
-		DiagramRulersAndGridPreferencePage.initDefaults(store);
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IPreferenceStore getPreferenceStore() {
-		return UMLDiagramEditorPlugin.getInstance().getPreferenceStore();
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.preferences;

+

+import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;

+import org.eclipse.jface.preference.IPreferenceStore;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public class DiagramPreferenceInitializer extends AbstractPreferenceInitializer {

+

+	/**

+	 * @generated

+	 */

+	public void initializeDefaultPreferences() {

+		IPreferenceStore store = getPreferenceStore();

+		DiagramGeneralPreferencePage.initDefaults(store);

+		DiagramAppearancePreferencePage.initDefaults(store);

+		DiagramConnectionsPreferencePage.initDefaults(store);

+		DiagramPrintingPreferencePage.initDefaults(store);

+		DiagramRulersAndGridPreferencePage.initDefaults(store);

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IPreferenceStore getPreferenceStore() {

+		return UMLDiagramEditorPlugin.getInstance().getPreferenceStore();

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramPrintingPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramPrintingPreferencePage.java
index 88052166262..cd895de9451 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramPrintingPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramPrintingPreferencePage.java
@@ -1,28 +1,28 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.preferences;
-
-import org.eclipse.gmf.runtime.diagram.ui.preferences.PrintingPreferencePage;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class DiagramPrintingPreferencePage extends PrintingPreferencePage
-{
-	/**
-	 * @generated
-	 */
-	public DiagramPrintingPreferencePage() {
-		setPreferenceStore(UMLDiagramEditorPlugin.getInstance().getPreferenceStore());
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.preferences;

+

+import org.eclipse.gmf.runtime.diagram.ui.preferences.PrintingPreferencePage;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public class DiagramPrintingPreferencePage extends PrintingPreferencePage {

+

+	/**

+	 * @generated

+	 */

+	public DiagramPrintingPreferencePage() {

+		setPreferenceStore(UMLDiagramEditorPlugin.getInstance().getPreferenceStore());

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramRulersAndGridPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramRulersAndGridPreferencePage.java
index 5f4f3810f46..364930abff9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramRulersAndGridPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/preferences/DiagramRulersAndGridPreferencePage.java
@@ -1,28 +1,28 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.preferences;
-
-import org.eclipse.gmf.runtime.diagram.ui.preferences.RulerGridPreferencePage;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;
-
-/**
- * @generated
- */
-public class DiagramRulersAndGridPreferencePage extends RulerGridPreferencePage
-{
-	/**
-	 * @generated
-	 */
-	public DiagramRulersAndGridPreferencePage() {
-		setPreferenceStore(UMLDiagramEditorPlugin.getInstance().getPreferenceStore());
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.preferences;

+

+import org.eclipse.gmf.runtime.diagram.ui.preferences.RulerGridPreferencePage;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

+

+/**

+ * @generated

+ */

+public class DiagramRulersAndGridPreferencePage extends RulerGridPreferencePage {

+

+	/**

+	 * @generated

+	 */

+	public DiagramRulersAndGridPreferencePage() {

+		setPreferenceStore(UMLDiagramEditorPlugin.getInstance().getPreferenceStore());

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/ElementInitializers.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/ElementInitializers.java
index 4fa1e1de1af..ff1510cd686 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/ElementInitializers.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/ElementInitializers.java
@@ -1,2290 +1,2074 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.providers;
-
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;
-import org.eclipse.uml2.uml.Abstraction;
-import org.eclipse.uml2.uml.Activity;
-import org.eclipse.uml2.uml.Actor;
-import org.eclipse.uml2.uml.AggregationKind;
-import org.eclipse.uml2.uml.AnyReceiveEvent;
-import org.eclipse.uml2.uml.Artifact;
-import org.eclipse.uml2.uml.CallEvent;
-import org.eclipse.uml2.uml.ChangeEvent;
-import org.eclipse.uml2.uml.Class;
-import org.eclipse.uml2.uml.Collaboration;
-import org.eclipse.uml2.uml.CollaborationUse;
-import org.eclipse.uml2.uml.Comment;
-import org.eclipse.uml2.uml.Component;
-import org.eclipse.uml2.uml.ComponentRealization;
-import org.eclipse.uml2.uml.ConnectableElement;
-import org.eclipse.uml2.uml.Connector;
-import org.eclipse.uml2.uml.Constraint;
-import org.eclipse.uml2.uml.DataType;
-import org.eclipse.uml2.uml.Dependency;
-import org.eclipse.uml2.uml.Deployment;
-import org.eclipse.uml2.uml.DeploymentSpecification;
-import org.eclipse.uml2.uml.Device;
-import org.eclipse.uml2.uml.Duration;
-import org.eclipse.uml2.uml.DurationConstraint;
-import org.eclipse.uml2.uml.DurationInterval;
-import org.eclipse.uml2.uml.DurationObservation;
-import org.eclipse.uml2.uml.Enumeration;
-import org.eclipse.uml2.uml.EnumerationLiteral;
-import org.eclipse.uml2.uml.ExecutionEnvironment;
-import org.eclipse.uml2.uml.Expression;
-import org.eclipse.uml2.uml.FunctionBehavior;
-import org.eclipse.uml2.uml.InformationFlow;
-import org.eclipse.uml2.uml.InformationItem;
-import org.eclipse.uml2.uml.InstanceValue;
-import org.eclipse.uml2.uml.Interaction;
-import org.eclipse.uml2.uml.InteractionConstraint;
-import org.eclipse.uml2.uml.Interface;
-import org.eclipse.uml2.uml.InterfaceRealization;
-import org.eclipse.uml2.uml.Interval;
-import org.eclipse.uml2.uml.IntervalConstraint;
-import org.eclipse.uml2.uml.LiteralBoolean;
-import org.eclipse.uml2.uml.LiteralInteger;
-import org.eclipse.uml2.uml.LiteralNull;
-import org.eclipse.uml2.uml.LiteralString;
-import org.eclipse.uml2.uml.LiteralUnlimitedNatural;
-import org.eclipse.uml2.uml.Manifestation;
-import org.eclipse.uml2.uml.Node;
-import org.eclipse.uml2.uml.OpaqueBehavior;
-import org.eclipse.uml2.uml.OpaqueExpression;
-import org.eclipse.uml2.uml.Operation;
-import org.eclipse.uml2.uml.Parameter;
-import org.eclipse.uml2.uml.Port;
-import org.eclipse.uml2.uml.PrimitiveType;
-import org.eclipse.uml2.uml.Property;
-import org.eclipse.uml2.uml.ProtocolStateMachine;
-import org.eclipse.uml2.uml.Realization;
-import org.eclipse.uml2.uml.Signal;
-import org.eclipse.uml2.uml.SignalEvent;
-import org.eclipse.uml2.uml.StateMachine;
-import org.eclipse.uml2.uml.StringExpression;
-import org.eclipse.uml2.uml.Substitution;
-import org.eclipse.uml2.uml.TimeConstraint;
-import org.eclipse.uml2.uml.TimeEvent;
-import org.eclipse.uml2.uml.TimeExpression;
-import org.eclipse.uml2.uml.TimeInterval;
-import org.eclipse.uml2.uml.TimeObservation;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.Usage;
-import org.eclipse.uml2.uml.UseCase;
-import org.eclipse.uml2.uml.ValueSpecification;
-
-/**
- * @generated
- */
-public class ElementInitializers {
-	protected ElementInitializers() {
-		// use #getInstance to access cached instance
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Activity_2060(Activity instance) {
-		try {
-			Object value_0 = name_Activity_2060(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Interaction_2061(Interaction instance) {
-		try {
-			Object value_0 = name_Interaction_2061(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_ProtocolStateMachine_2062(ProtocolStateMachine instance) {
-		try {
-			Object value_0 = name_ProtocolStateMachine_2062(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_StateMachine_2063(StateMachine instance) {
-		try {
-			Object value_0 = name_StateMachine_2063(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_FunctionBehavior_2064(FunctionBehavior instance) {
-		try {
-			Object value_0 = name_FunctionBehavior_2064(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_OpaqueBehavior_2065(OpaqueBehavior instance) {
-		try {
-			Object value_0 = name_OpaqueBehavior_2065(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Component_2069(Component instance) {
-		try {
-			Object value_0 = name_Component_2069(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Device_2070(Device instance) {
-		try {
-			Object value_0 = name_Device_2070(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_ExecutionEnvironment_2071(ExecutionEnvironment instance) {
-		try {
-			Object value_0 = name_ExecutionEnvironment_2071(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Node_2072(Node instance) {
-		try {
-			Object value_0 = name_Node_2072(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Class_2073(Class instance) {
-		try {
-			Object value_0 = name_Class_2073(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Collaboration_2075(Collaboration instance) {
-		try {
-			Object value_0 = name_Collaboration_2075(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Interface_2076(Interface instance) {
-		try {
-			Object value_0 = name_Interface_2076(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_PrimitiveType_2066(PrimitiveType instance) {
-		try {
-			Object value_0 = name_PrimitiveType_2066(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Enumeration_2067(Enumeration instance) {
-		try {
-			Object value_0 = name_Enumeration_2067(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_DataType_2068(DataType instance) {
-		try {
-			Object value_0 = name_DataType_2068(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Actor_2077(Actor instance) {
-		try {
-			Object value_0 = name_Actor_2077(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_DeploymentSpecification_2078(DeploymentSpecification instance) {
-		try {
-			Object value_0 = name_DeploymentSpecification_2078(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Artifact_2079(Artifact instance) {
-		try {
-			Object value_0 = name_Artifact_2079(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_InformationItem_2080(InformationItem instance) {
-		try {
-			Object value_0 = name_InformationItem_2080(instance);
-			instance.setName(
-					(String) value_0
-					);
-			Object value_1 = isAbstract_InformationItem_2080(instance);
-			instance.setIsAbstract(
-					((Boolean) value_1).booleanValue()
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Signal_2081(Signal instance) {
-		try {
-			Object value_0 = name_Signal_2081(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_UseCase_2082(UseCase instance) {
-		try {
-			Object value_0 = name_UseCase_2082(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_SignalEvent_2083(SignalEvent instance) {
-		try {
-			Object value_0 = name_SignalEvent_2083(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_CallEvent_2084(CallEvent instance) {
-		try {
-			Object value_0 = name_CallEvent_2084(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_AnyReceiveEvent_2085(AnyReceiveEvent instance) {
-		try {
-			Object value_0 = name_AnyReceiveEvent_2085(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_ChangeEvent_2088(ChangeEvent instance) {
-		try {
-			Object value_0 = name_ChangeEvent_2088(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_TimeEvent_2089(TimeEvent instance) {
-		try {
-			Object value_0 = name_TimeEvent_2089(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_DurationObservation_2093(DurationObservation instance) {
-		try {
-			Object value_0 = name_DurationObservation_2093(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_TimeObservation_2094(TimeObservation instance) {
-		try {
-			Object value_0 = name_TimeObservation_2094(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_LiteralBoolean_2095(LiteralBoolean instance) {
-		try {
-			Object value_0 = name_LiteralBoolean_2095(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_LiteralInteger_2096(LiteralInteger instance) {
-		try {
-			Object value_0 = name_LiteralInteger_2096(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_LiteralNull_2097(LiteralNull instance) {
-		try {
-			Object value_0 = name_LiteralNull_2097(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_LiteralString_2098(LiteralString instance) {
-		try {
-			Object value_0 = name_LiteralString_2098(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_LiteralUnlimitedNatural_2099(LiteralUnlimitedNatural instance) {
-		try {
-			Object value_0 = name_LiteralUnlimitedNatural_2099(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_StringExpression_2100(StringExpression instance) {
-		try {
-			Object value_0 = name_StringExpression_2100(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_OpaqueExpression_2101(OpaqueExpression instance) {
-		try {
-			Object value_0 = name_OpaqueExpression_2101(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_TimeExpression_2102(TimeExpression instance) {
-		try {
-			Object value_0 = name_TimeExpression_2102(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Expression_2103(Expression instance) {
-		try {
-			Object value_0 = name_Expression_2103(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Duration_2104(Duration instance) {
-		try {
-			Object value_0 = name_Duration_2104(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_TimeInterval_2105(TimeInterval instance) {
-		try {
-			Object value_0 = name_TimeInterval_2105(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_DurationInterval_2106(DurationInterval instance) {
-		try {
-			Object value_0 = name_DurationInterval_2106(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Interval_2107(Interval instance) {
-		try {
-			Object value_0 = name_Interval_2107(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_InstanceValue_2108(InstanceValue instance) {
-		try {
-			Object value_0 = name_InstanceValue_2108(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Comment_2109(Comment instance) {
-		try {
-			Object value_0 = body_Comment_2109(instance);
-			instance.setBody(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_DurationConstraint_2110(DurationConstraint instance) {
-		try {
-			Object value_0 = name_DurationConstraint_2110(instance);
-			instance.setName(
-					(String) value_0
-					);
-			Object value_1 = specification_DurationConstraint_2110(instance);
-			instance.setSpecification(
-					(ValueSpecification) value_1
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_TimeConstraint_2111(TimeConstraint instance) {
-		try {
-			Object value_0 = name_TimeConstraint_2111(instance);
-			instance.setName(
-					(String) value_0
-					);
-			Object value_1 = specification_TimeConstraint_2111(instance);
-			instance.setSpecification(
-					(ValueSpecification) value_1
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_IntervalConstraint_2112(IntervalConstraint instance) {
-		try {
-			Object value_0 = name_IntervalConstraint_2112(instance);
-			instance.setName(
-					(String) value_0
-					);
-			Object value_1 = specification_IntervalConstraint_2112(instance);
-			instance.setSpecification(
-					(ValueSpecification) value_1
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_InteractionConstraint_2113(InteractionConstraint instance) {
-		try {
-			Object value_0 = name_InteractionConstraint_2113(instance);
-			instance.setName(
-					(String) value_0
-					);
-			Object value_1 = specification_InteractionConstraint_2113(instance);
-			instance.setSpecification(
-					(ValueSpecification) value_1
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Constraint_2114(Constraint instance) {
-		try {
-			Object value_0 = name_Constraint_2114(instance);
-			instance.setName(
-					(String) value_0
-					);
-			Object value_1 = specification_Constraint_2114(instance);
-			instance.setSpecification(
-					(ValueSpecification) value_1
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Port_3069(Port instance) {
-		try {
-			Object value_0 = name_Port_3069(instance);
-			instance.setName(
-					(String) value_0
-					);
-			instance.setAggregation(
-					AggregationKind.COMPOSITE_LITERAL
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Parameter_3088(Parameter instance) {
-		try {
-			Object value_0 = name_Parameter_3088(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Property_3070(Property instance) {
-		try {
-			Object value_0 = name_Property_3070(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_ConnectableElement_3115(ConnectableElement instance) {
-		try {
-			Object value_0 = name_ConnectableElement_3115(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_CollaborationUse_3071(CollaborationUse instance) {
-		try {
-			Object value_0 = name_CollaborationUse_3071(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Activity_3072(Activity instance) {
-		try {
-			Object value_0 = name_Activity_3072(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Interaction_3073(Interaction instance) {
-		try {
-			Object value_0 = name_Interaction_3073(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_ProtocolStateMachine_3074(ProtocolStateMachine instance) {
-		try {
-			Object value_0 = name_ProtocolStateMachine_3074(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_StateMachine_3075(StateMachine instance) {
-		try {
-			Object value_0 = name_StateMachine_3075(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_FunctionBehavior_3076(FunctionBehavior instance) {
-		try {
-			Object value_0 = name_FunctionBehavior_3076(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_OpaqueBehavior_3077(OpaqueBehavior instance) {
-		try {
-			Object value_0 = name_OpaqueBehavior_3077(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Component_3081(Component instance) {
-		try {
-			Object value_0 = name_Component_3081(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Device_3082(Device instance) {
-		try {
-			Object value_0 = name_Device_3082(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_ExecutionEnvironment_3083(ExecutionEnvironment instance) {
-		try {
-			Object value_0 = name_ExecutionEnvironment_3083(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Node_3084(Node instance) {
-		try {
-			Object value_0 = name_Node_3084(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Class_3085(Class instance) {
-		try {
-			Object value_0 = name_Class_3085(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Collaboration_3086(Collaboration instance) {
-		try {
-			Object value_0 = name_Collaboration_3086(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Interface_3087(Interface instance) {
-		try {
-			Object value_0 = name_Interface_3087(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_PrimitiveType_3078(PrimitiveType instance) {
-		try {
-			Object value_0 = name_PrimitiveType_3078(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Enumeration_3079(Enumeration instance) {
-		try {
-			Object value_0 = name_Enumeration_3079(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_DataType_3080(DataType instance) {
-		try {
-			Object value_0 = name_DataType_3080(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Actor_3091(Actor instance) {
-		try {
-			Object value_0 = name_Actor_3091(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_DeploymentSpecification_3092(DeploymentSpecification instance) {
-		try {
-			Object value_0 = name_DeploymentSpecification_3092(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Artifact_3093(Artifact instance) {
-		try {
-			Object value_0 = name_Artifact_3093(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_InformationItem_3094(InformationItem instance) {
-		try {
-			Object value_0 = name_InformationItem_3094(instance);
-			instance.setName(
-					(String) value_0
-					);
-			Object value_1 = isAbstract_InformationItem_3094(instance);
-			instance.setIsAbstract(
-					((Boolean) value_1).booleanValue()
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Signal_3095(Signal instance) {
-		try {
-			Object value_0 = name_Signal_3095(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_UseCase_3096(UseCase instance) {
-		try {
-			Object value_0 = name_UseCase_3096(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Comment_3097(Comment instance) {
-		try {
-			Object value_0 = body_Comment_3097(instance);
-			instance.setBody(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_DurationConstraint_3116(DurationConstraint instance) {
-		try {
-			Object value_0 = name_DurationConstraint_3116(instance);
-			instance.setName(
-					(String) value_0
-					);
-			Object value_1 = specification_DurationConstraint_3116(instance);
-			instance.setSpecification(
-					(ValueSpecification) value_1
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_TimeConstraint_3117(TimeConstraint instance) {
-		try {
-			Object value_0 = name_TimeConstraint_3117(instance);
-			instance.setName(
-					(String) value_0
-					);
-			Object value_1 = specification_TimeConstraint_3117(instance);
-			instance.setSpecification(
-					(ValueSpecification) value_1
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_IntervalConstraint_3118(IntervalConstraint instance) {
-		try {
-			Object value_0 = name_IntervalConstraint_3118(instance);
-			instance.setName(
-					(String) value_0
-					);
-			Object value_1 = specification_IntervalConstraint_3118(instance);
-			instance.setSpecification(
-					(ValueSpecification) value_1
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_InteractionConstraint_3119(InteractionConstraint instance) {
-		try {
-			Object value_0 = name_InteractionConstraint_3119(instance);
-			instance.setName(
-					(String) value_0
-					);
-			Object value_1 = specification_InteractionConstraint_3119(instance);
-			instance.setSpecification(
-					(ValueSpecification) value_1
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Constraint_3120(Constraint instance) {
-		try {
-			Object value_0 = name_Constraint_3120(instance);
-			instance.setName(
-					(String) value_0
-					);
-			Object value_1 = specification_Constraint_3120(instance);
-			instance.setSpecification(
-					(ValueSpecification) value_1
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Property_3101(Property instance) {
-		try {
-			Object value_0 = name_Property_3101(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Operation_3102(Operation instance) {
-		try {
-			Object value_0 = name_Operation_3102(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_EnumerationLiteral_3066(EnumerationLiteral instance) {
-		try {
-			Object value_0 = name_EnumerationLiteral_3066(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_ComponentRealization_4004(ComponentRealization instance) {
-		try {
-			Object value_0 = name_ComponentRealization_4004(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_InterfaceRealization_4005(InterfaceRealization instance) {
-		try {
-			Object value_0 = name_InterfaceRealization_4005(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Substitution_4011(Substitution instance) {
-		try {
-			Object value_0 = name_Substitution_4011(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Realization_4006(Realization instance) {
-		try {
-			Object value_0 = name_Realization_4006(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Manifestation_4012(Manifestation instance) {
-		try {
-			Object value_0 = name_Manifestation_4012(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Abstraction_4007(Abstraction instance) {
-		try {
-			Object value_0 = name_Abstraction_4007(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Usage_4008(Usage instance) {
-		try {
-			Object value_0 = name_Usage_4008(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Deployment_4009(Deployment instance) {
-		try {
-			Object value_0 = name_Deployment_4009(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Dependency_4010(Dependency instance) {
-		try {
-			Object value_0 = name_Dependency_4010(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_Connector_4013(Connector instance) {
-		try {
-			Object value_0 = name_Connector_4013(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public void init_InformationFlow_4021(InformationFlow instance) {
-		try {
-			Object value_0 = name_InformationFlow_4021(instance);
-			instance.setName(
-					(String) value_0
-					);
-		} catch (RuntimeException e) {
-			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Activity_2060(Activity it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Interaction_2061(Interaction it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_ProtocolStateMachine_2062(ProtocolStateMachine it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_StateMachine_2063(StateMachine it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_FunctionBehavior_2064(FunctionBehavior it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_OpaqueBehavior_2065(OpaqueBehavior it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Component_2069(Component it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Device_2070(Device it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_ExecutionEnvironment_2071(ExecutionEnvironment it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Node_2072(Node it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Class_2073(Class it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Collaboration_2075(Collaboration it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Interface_2076(Interface it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_PrimitiveType_2066(PrimitiveType it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Enumeration_2067(Enumeration it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_DataType_2068(DataType it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Actor_2077(Actor it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_DeploymentSpecification_2078(DeploymentSpecification it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Artifact_2079(Artifact it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_InformationItem_2080(InformationItem it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private Boolean isAbstract_InformationItem_2080(InformationItem it) {
-		// InformationItem is Abstract
-		return true;
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Signal_2081(Signal it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_UseCase_2082(UseCase it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_SignalEvent_2083(SignalEvent it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_CallEvent_2084(CallEvent it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_AnyReceiveEvent_2085(AnyReceiveEvent it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_ChangeEvent_2088(ChangeEvent it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_TimeEvent_2089(TimeEvent it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_DurationObservation_2093(DurationObservation it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_TimeObservation_2094(TimeObservation it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_LiteralBoolean_2095(LiteralBoolean it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_LiteralInteger_2096(LiteralInteger it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_LiteralNull_2097(LiteralNull it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_LiteralString_2098(LiteralString it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_LiteralUnlimitedNatural_2099(LiteralUnlimitedNatural it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_StringExpression_2100(StringExpression it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_OpaqueExpression_2101(OpaqueExpression it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_TimeExpression_2102(TimeExpression it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Expression_2103(Expression it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Duration_2104(Duration it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_TimeInterval_2105(TimeInterval it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_DurationInterval_2106(DurationInterval it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Interval_2107(Interval it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_InstanceValue_2108(InstanceValue it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String body_Comment_2109(Comment it) {
-		// Comment body init
-		return "";
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_DurationConstraint_2110(DurationConstraint it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private ValueSpecification specification_DurationConstraint_2110(DurationConstraint it) {
-		// Constraint specification init
-		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();
-		value.setValue("");
-		return value;
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_TimeConstraint_2111(TimeConstraint it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private ValueSpecification specification_TimeConstraint_2111(TimeConstraint it) {
-		// Constraint specification init
-		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();
-		value.setValue("");
-		return value;
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_IntervalConstraint_2112(IntervalConstraint it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private ValueSpecification specification_IntervalConstraint_2112(IntervalConstraint it) {
-		// Constraint specification init
-		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();
-		value.setValue("");
-		return value;
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_InteractionConstraint_2113(InteractionConstraint it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private ValueSpecification specification_InteractionConstraint_2113(InteractionConstraint it) {
-		// Constraint specification init
-		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();
-		value.setValue("");
-		return value;
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Constraint_2114(Constraint it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private ValueSpecification specification_Constraint_2114(Constraint it) {
-		// Constraint specification init
-		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();
-		value.setValue("");
-		return value;
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Port_3069(Port it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Parameter_3088(Parameter it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Property_3070(Property it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_ConnectableElement_3115(ConnectableElement it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_CollaborationUse_3071(CollaborationUse it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Activity_3072(Activity it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Interaction_3073(Interaction it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_ProtocolStateMachine_3074(ProtocolStateMachine it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_StateMachine_3075(StateMachine it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_FunctionBehavior_3076(FunctionBehavior it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_OpaqueBehavior_3077(OpaqueBehavior it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Component_3081(Component it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Device_3082(Device it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_ExecutionEnvironment_3083(ExecutionEnvironment it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Node_3084(Node it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Class_3085(Class it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Collaboration_3086(Collaboration it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Interface_3087(Interface it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_PrimitiveType_3078(PrimitiveType it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Enumeration_3079(Enumeration it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_DataType_3080(DataType it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Actor_3091(Actor it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_DeploymentSpecification_3092(DeploymentSpecification it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Artifact_3093(Artifact it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_InformationItem_3094(InformationItem it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private Boolean isAbstract_InformationItem_3094(InformationItem it) {
-		// InformationItem is Abstract
-		return true;
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Signal_3095(Signal it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_UseCase_3096(UseCase it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String body_Comment_3097(Comment it) {
-		// Comment body init
-		return "";
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_DurationConstraint_3116(DurationConstraint it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private ValueSpecification specification_DurationConstraint_3116(DurationConstraint it) {
-		// Constraint specification init
-		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();
-		value.setValue("");
-		return value;
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_TimeConstraint_3117(TimeConstraint it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private ValueSpecification specification_TimeConstraint_3117(TimeConstraint it) {
-		// Constraint specification init
-		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();
-		value.setValue("");
-		return value;
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_IntervalConstraint_3118(IntervalConstraint it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private ValueSpecification specification_IntervalConstraint_3118(IntervalConstraint it) {
-		// Constraint specification init
-		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();
-		value.setValue("");
-		return value;
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_InteractionConstraint_3119(InteractionConstraint it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private ValueSpecification specification_InteractionConstraint_3119(InteractionConstraint it) {
-		// Constraint specification init
-		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();
-		value.setValue("");
-		return value;
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Constraint_3120(Constraint it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private ValueSpecification specification_Constraint_3120(Constraint it) {
-		// Constraint specification init
-		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();
-		value.setValue("");
-		return value;
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Property_3101(Property it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Operation_3102(Operation it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_EnumerationLiteral_3066(EnumerationLiteral it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_ComponentRealization_4004(ComponentRealization it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_InterfaceRealization_4005(InterfaceRealization it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Substitution_4011(Substitution it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Realization_4006(Realization it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Manifestation_4012(Manifestation it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Abstraction_4007(Abstraction it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Usage_4008(Usage it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Deployment_4009(Deployment it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Dependency_4010(Dependency it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_Connector_4013(Connector it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	private String name_InformationFlow_4021(InformationFlow it) {
-		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());
-	}
-
-	/**
-	 * @generated
-	 */
-	public static ElementInitializers getInstance() {
-		ElementInitializers cached = UMLDiagramEditorPlugin.getInstance().getElementInitializers();
-		if (cached == null) {
-			UMLDiagramEditorPlugin.getInstance().setElementInitializers(cached = new ElementInitializers());
-		}
-		return cached;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.providers;

+

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.tools.utils.NamedElementUtil;

+import org.eclipse.uml2.uml.Abstraction;

+import org.eclipse.uml2.uml.Activity;

+import org.eclipse.uml2.uml.Actor;

+import org.eclipse.uml2.uml.AggregationKind;

+import org.eclipse.uml2.uml.AnyReceiveEvent;

+import org.eclipse.uml2.uml.Artifact;

+import org.eclipse.uml2.uml.CallEvent;

+import org.eclipse.uml2.uml.ChangeEvent;

+import org.eclipse.uml2.uml.Class;

+import org.eclipse.uml2.uml.Collaboration;

+import org.eclipse.uml2.uml.CollaborationUse;

+import org.eclipse.uml2.uml.Comment;

+import org.eclipse.uml2.uml.Component;

+import org.eclipse.uml2.uml.ComponentRealization;

+import org.eclipse.uml2.uml.ConnectableElement;

+import org.eclipse.uml2.uml.Connector;

+import org.eclipse.uml2.uml.Constraint;

+import org.eclipse.uml2.uml.DataType;

+import org.eclipse.uml2.uml.Dependency;

+import org.eclipse.uml2.uml.Deployment;

+import org.eclipse.uml2.uml.DeploymentSpecification;

+import org.eclipse.uml2.uml.Device;

+import org.eclipse.uml2.uml.Duration;

+import org.eclipse.uml2.uml.DurationConstraint;

+import org.eclipse.uml2.uml.DurationInterval;

+import org.eclipse.uml2.uml.DurationObservation;

+import org.eclipse.uml2.uml.Enumeration;

+import org.eclipse.uml2.uml.EnumerationLiteral;

+import org.eclipse.uml2.uml.ExecutionEnvironment;

+import org.eclipse.uml2.uml.Expression;

+import org.eclipse.uml2.uml.FunctionBehavior;

+import org.eclipse.uml2.uml.InformationFlow;

+import org.eclipse.uml2.uml.InformationItem;

+import org.eclipse.uml2.uml.InstanceValue;

+import org.eclipse.uml2.uml.Interaction;

+import org.eclipse.uml2.uml.InteractionConstraint;

+import org.eclipse.uml2.uml.Interface;

+import org.eclipse.uml2.uml.InterfaceRealization;

+import org.eclipse.uml2.uml.Interval;

+import org.eclipse.uml2.uml.IntervalConstraint;

+import org.eclipse.uml2.uml.LiteralBoolean;

+import org.eclipse.uml2.uml.LiteralInteger;

+import org.eclipse.uml2.uml.LiteralNull;

+import org.eclipse.uml2.uml.LiteralString;

+import org.eclipse.uml2.uml.LiteralUnlimitedNatural;

+import org.eclipse.uml2.uml.Manifestation;

+import org.eclipse.uml2.uml.Node;

+import org.eclipse.uml2.uml.OpaqueBehavior;

+import org.eclipse.uml2.uml.OpaqueExpression;

+import org.eclipse.uml2.uml.Operation;

+import org.eclipse.uml2.uml.Parameter;

+import org.eclipse.uml2.uml.Port;

+import org.eclipse.uml2.uml.PrimitiveType;

+import org.eclipse.uml2.uml.Property;

+import org.eclipse.uml2.uml.ProtocolStateMachine;

+import org.eclipse.uml2.uml.Realization;

+import org.eclipse.uml2.uml.Signal;

+import org.eclipse.uml2.uml.SignalEvent;

+import org.eclipse.uml2.uml.StateMachine;

+import org.eclipse.uml2.uml.StringExpression;

+import org.eclipse.uml2.uml.Substitution;

+import org.eclipse.uml2.uml.TimeConstraint;

+import org.eclipse.uml2.uml.TimeEvent;

+import org.eclipse.uml2.uml.TimeExpression;

+import org.eclipse.uml2.uml.TimeInterval;

+import org.eclipse.uml2.uml.TimeObservation;

+import org.eclipse.uml2.uml.UMLFactory;

+import org.eclipse.uml2.uml.Usage;

+import org.eclipse.uml2.uml.UseCase;

+import org.eclipse.uml2.uml.ValueSpecification;

+

+/**

+ * @generated

+ */

+public class ElementInitializers {

+

+	protected ElementInitializers() {

+		// use #getInstance to access cached instance

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Activity_2060(Activity instance) {

+		try {

+			Object value_0 = name_Activity_2060(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Interaction_2061(Interaction instance) {

+		try {

+			Object value_0 = name_Interaction_2061(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_ProtocolStateMachine_2062(ProtocolStateMachine instance) {

+		try {

+			Object value_0 = name_ProtocolStateMachine_2062(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_StateMachine_2063(StateMachine instance) {

+		try {

+			Object value_0 = name_StateMachine_2063(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_FunctionBehavior_2064(FunctionBehavior instance) {

+		try {

+			Object value_0 = name_FunctionBehavior_2064(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_OpaqueBehavior_2065(OpaqueBehavior instance) {

+		try {

+			Object value_0 = name_OpaqueBehavior_2065(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Component_2069(Component instance) {

+		try {

+			Object value_0 = name_Component_2069(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Device_2070(Device instance) {

+		try {

+			Object value_0 = name_Device_2070(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_ExecutionEnvironment_2071(ExecutionEnvironment instance) {

+		try {

+			Object value_0 = name_ExecutionEnvironment_2071(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Node_2072(Node instance) {

+		try {

+			Object value_0 = name_Node_2072(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Class_2073(Class instance) {

+		try {

+			Object value_0 = name_Class_2073(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Collaboration_2075(Collaboration instance) {

+		try {

+			Object value_0 = name_Collaboration_2075(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Interface_2076(Interface instance) {

+		try {

+			Object value_0 = name_Interface_2076(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_PrimitiveType_2066(PrimitiveType instance) {

+		try {

+			Object value_0 = name_PrimitiveType_2066(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Enumeration_2067(Enumeration instance) {

+		try {

+			Object value_0 = name_Enumeration_2067(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_DataType_2068(DataType instance) {

+		try {

+			Object value_0 = name_DataType_2068(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Actor_2077(Actor instance) {

+		try {

+			Object value_0 = name_Actor_2077(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_DeploymentSpecification_2078(DeploymentSpecification instance) {

+		try {

+			Object value_0 = name_DeploymentSpecification_2078(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Artifact_2079(Artifact instance) {

+		try {

+			Object value_0 = name_Artifact_2079(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_InformationItem_2080(InformationItem instance) {

+		try {

+			Object value_0 = name_InformationItem_2080(instance);

+			instance.setName((String)value_0);

+			Object value_1 = isAbstract_InformationItem_2080(instance);

+			instance.setIsAbstract(((Boolean)value_1).booleanValue());

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Signal_2081(Signal instance) {

+		try {

+			Object value_0 = name_Signal_2081(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_UseCase_2082(UseCase instance) {

+		try {

+			Object value_0 = name_UseCase_2082(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_SignalEvent_2083(SignalEvent instance) {

+		try {

+			Object value_0 = name_SignalEvent_2083(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_CallEvent_2084(CallEvent instance) {

+		try {

+			Object value_0 = name_CallEvent_2084(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_AnyReceiveEvent_2085(AnyReceiveEvent instance) {

+		try {

+			Object value_0 = name_AnyReceiveEvent_2085(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_ChangeEvent_2088(ChangeEvent instance) {

+		try {

+			Object value_0 = name_ChangeEvent_2088(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_TimeEvent_2089(TimeEvent instance) {

+		try {

+			Object value_0 = name_TimeEvent_2089(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_DurationObservation_2093(DurationObservation instance) {

+		try {

+			Object value_0 = name_DurationObservation_2093(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_TimeObservation_2094(TimeObservation instance) {

+		try {

+			Object value_0 = name_TimeObservation_2094(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_LiteralBoolean_2095(LiteralBoolean instance) {

+		try {

+			Object value_0 = name_LiteralBoolean_2095(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_LiteralInteger_2096(LiteralInteger instance) {

+		try {

+			Object value_0 = name_LiteralInteger_2096(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_LiteralNull_2097(LiteralNull instance) {

+		try {

+			Object value_0 = name_LiteralNull_2097(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_LiteralString_2098(LiteralString instance) {

+		try {

+			Object value_0 = name_LiteralString_2098(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_LiteralUnlimitedNatural_2099(LiteralUnlimitedNatural instance) {

+		try {

+			Object value_0 = name_LiteralUnlimitedNatural_2099(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_StringExpression_2100(StringExpression instance) {

+		try {

+			Object value_0 = name_StringExpression_2100(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_OpaqueExpression_2101(OpaqueExpression instance) {

+		try {

+			Object value_0 = name_OpaqueExpression_2101(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_TimeExpression_2102(TimeExpression instance) {

+		try {

+			Object value_0 = name_TimeExpression_2102(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Expression_2103(Expression instance) {

+		try {

+			Object value_0 = name_Expression_2103(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Duration_2104(Duration instance) {

+		try {

+			Object value_0 = name_Duration_2104(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_TimeInterval_2105(TimeInterval instance) {

+		try {

+			Object value_0 = name_TimeInterval_2105(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_DurationInterval_2106(DurationInterval instance) {

+		try {

+			Object value_0 = name_DurationInterval_2106(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Interval_2107(Interval instance) {

+		try {

+			Object value_0 = name_Interval_2107(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_InstanceValue_2108(InstanceValue instance) {

+		try {

+			Object value_0 = name_InstanceValue_2108(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Comment_2109(Comment instance) {

+		try {

+			Object value_0 = body_Comment_2109(instance);

+			instance.setBody((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_DurationConstraint_2110(DurationConstraint instance) {

+		try {

+			Object value_0 = name_DurationConstraint_2110(instance);

+			instance.setName((String)value_0);

+			Object value_1 = specification_DurationConstraint_2110(instance);

+			instance.setSpecification((ValueSpecification)value_1);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_TimeConstraint_2111(TimeConstraint instance) {

+		try {

+			Object value_0 = name_TimeConstraint_2111(instance);

+			instance.setName((String)value_0);

+			Object value_1 = specification_TimeConstraint_2111(instance);

+			instance.setSpecification((ValueSpecification)value_1);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_IntervalConstraint_2112(IntervalConstraint instance) {

+		try {

+			Object value_0 = name_IntervalConstraint_2112(instance);

+			instance.setName((String)value_0);

+			Object value_1 = specification_IntervalConstraint_2112(instance);

+			instance.setSpecification((ValueSpecification)value_1);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_InteractionConstraint_2113(InteractionConstraint instance) {

+		try {

+			Object value_0 = name_InteractionConstraint_2113(instance);

+			instance.setName((String)value_0);

+			Object value_1 = specification_InteractionConstraint_2113(instance);

+			instance.setSpecification((ValueSpecification)value_1);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Constraint_2114(Constraint instance) {

+		try {

+			Object value_0 = name_Constraint_2114(instance);

+			instance.setName((String)value_0);

+			Object value_1 = specification_Constraint_2114(instance);

+			instance.setSpecification((ValueSpecification)value_1);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Port_3069(Port instance) {

+		try {

+			Object value_0 = name_Port_3069(instance);

+			instance.setName((String)value_0);

+			instance.setAggregation(AggregationKind.COMPOSITE_LITERAL);

+

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Parameter_3088(Parameter instance) {

+		try {

+			Object value_0 = name_Parameter_3088(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Property_3070(Property instance) {

+		try {

+			Object value_0 = name_Property_3070(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_ConnectableElement_3115(ConnectableElement instance) {

+		try {

+			Object value_0 = name_ConnectableElement_3115(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_CollaborationUse_3071(CollaborationUse instance) {

+		try {

+			Object value_0 = name_CollaborationUse_3071(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Activity_3072(Activity instance) {

+		try {

+			Object value_0 = name_Activity_3072(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Interaction_3073(Interaction instance) {

+		try {

+			Object value_0 = name_Interaction_3073(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_ProtocolStateMachine_3074(ProtocolStateMachine instance) {

+		try {

+			Object value_0 = name_ProtocolStateMachine_3074(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_StateMachine_3075(StateMachine instance) {

+		try {

+			Object value_0 = name_StateMachine_3075(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_FunctionBehavior_3076(FunctionBehavior instance) {

+		try {

+			Object value_0 = name_FunctionBehavior_3076(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_OpaqueBehavior_3077(OpaqueBehavior instance) {

+		try {

+			Object value_0 = name_OpaqueBehavior_3077(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Component_3081(Component instance) {

+		try {

+			Object value_0 = name_Component_3081(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Device_3082(Device instance) {

+		try {

+			Object value_0 = name_Device_3082(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_ExecutionEnvironment_3083(ExecutionEnvironment instance) {

+		try {

+			Object value_0 = name_ExecutionEnvironment_3083(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Node_3084(Node instance) {

+		try {

+			Object value_0 = name_Node_3084(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Class_3085(Class instance) {

+		try {

+			Object value_0 = name_Class_3085(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Collaboration_3086(Collaboration instance) {

+		try {

+			Object value_0 = name_Collaboration_3086(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Interface_3087(Interface instance) {

+		try {

+			Object value_0 = name_Interface_3087(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_PrimitiveType_3078(PrimitiveType instance) {

+		try {

+			Object value_0 = name_PrimitiveType_3078(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Enumeration_3079(Enumeration instance) {

+		try {

+			Object value_0 = name_Enumeration_3079(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_DataType_3080(DataType instance) {

+		try {

+			Object value_0 = name_DataType_3080(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Actor_3091(Actor instance) {

+		try {

+			Object value_0 = name_Actor_3091(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_DeploymentSpecification_3092(DeploymentSpecification instance) {

+		try {

+			Object value_0 = name_DeploymentSpecification_3092(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Artifact_3093(Artifact instance) {

+		try {

+			Object value_0 = name_Artifact_3093(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_InformationItem_3094(InformationItem instance) {

+		try {

+			Object value_0 = name_InformationItem_3094(instance);

+			instance.setName((String)value_0);

+			Object value_1 = isAbstract_InformationItem_3094(instance);

+			instance.setIsAbstract(((Boolean)value_1).booleanValue());

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Signal_3095(Signal instance) {

+		try {

+			Object value_0 = name_Signal_3095(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_UseCase_3096(UseCase instance) {

+		try {

+			Object value_0 = name_UseCase_3096(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Comment_3097(Comment instance) {

+		try {

+			Object value_0 = body_Comment_3097(instance);

+			instance.setBody((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_DurationConstraint_3116(DurationConstraint instance) {

+		try {

+			Object value_0 = name_DurationConstraint_3116(instance);

+			instance.setName((String)value_0);

+			Object value_1 = specification_DurationConstraint_3116(instance);

+			instance.setSpecification((ValueSpecification)value_1);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_TimeConstraint_3117(TimeConstraint instance) {

+		try {

+			Object value_0 = name_TimeConstraint_3117(instance);

+			instance.setName((String)value_0);

+			Object value_1 = specification_TimeConstraint_3117(instance);

+			instance.setSpecification((ValueSpecification)value_1);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_IntervalConstraint_3118(IntervalConstraint instance) {

+		try {

+			Object value_0 = name_IntervalConstraint_3118(instance);

+			instance.setName((String)value_0);

+			Object value_1 = specification_IntervalConstraint_3118(instance);

+			instance.setSpecification((ValueSpecification)value_1);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_InteractionConstraint_3119(InteractionConstraint instance) {

+		try {

+			Object value_0 = name_InteractionConstraint_3119(instance);

+			instance.setName((String)value_0);

+			Object value_1 = specification_InteractionConstraint_3119(instance);

+			instance.setSpecification((ValueSpecification)value_1);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Constraint_3120(Constraint instance) {

+		try {

+			Object value_0 = name_Constraint_3120(instance);

+			instance.setName((String)value_0);

+			Object value_1 = specification_Constraint_3120(instance);

+			instance.setSpecification((ValueSpecification)value_1);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Property_3101(Property instance) {

+		try {

+			Object value_0 = name_Property_3101(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Operation_3102(Operation instance) {

+		try {

+			Object value_0 = name_Operation_3102(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_EnumerationLiteral_3066(EnumerationLiteral instance) {

+		try {

+			Object value_0 = name_EnumerationLiteral_3066(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_ComponentRealization_4004(ComponentRealization instance) {

+		try {

+			Object value_0 = name_ComponentRealization_4004(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_InterfaceRealization_4005(InterfaceRealization instance) {

+		try {

+			Object value_0 = name_InterfaceRealization_4005(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Substitution_4011(Substitution instance) {

+		try {

+			Object value_0 = name_Substitution_4011(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Realization_4006(Realization instance) {

+		try {

+			Object value_0 = name_Realization_4006(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Manifestation_4012(Manifestation instance) {

+		try {

+			Object value_0 = name_Manifestation_4012(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Abstraction_4007(Abstraction instance) {

+		try {

+			Object value_0 = name_Abstraction_4007(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Usage_4008(Usage instance) {

+		try {

+			Object value_0 = name_Usage_4008(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Deployment_4009(Deployment instance) {

+		try {

+			Object value_0 = name_Deployment_4009(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Dependency_4010(Dependency instance) {

+		try {

+			Object value_0 = name_Dependency_4010(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_Connector_4013(Connector instance) {

+		try {

+			Object value_0 = name_Connector_4013(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public void init_InformationFlow_4021(InformationFlow instance) {

+		try {

+			Object value_0 = name_InformationFlow_4021(instance);

+			instance.setName((String)value_0);

+		} catch (RuntimeException e) {

+			UMLDiagramEditorPlugin.getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Activity_2060(Activity it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Interaction_2061(Interaction it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_ProtocolStateMachine_2062(ProtocolStateMachine it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_StateMachine_2063(StateMachine it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_FunctionBehavior_2064(FunctionBehavior it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_OpaqueBehavior_2065(OpaqueBehavior it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Component_2069(Component it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Device_2070(Device it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_ExecutionEnvironment_2071(ExecutionEnvironment it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Node_2072(Node it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Class_2073(Class it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Collaboration_2075(Collaboration it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Interface_2076(Interface it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_PrimitiveType_2066(PrimitiveType it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Enumeration_2067(Enumeration it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_DataType_2068(DataType it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Actor_2077(Actor it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_DeploymentSpecification_2078(DeploymentSpecification it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Artifact_2079(Artifact it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_InformationItem_2080(InformationItem it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private Boolean isAbstract_InformationItem_2080(InformationItem it) {

+		// InformationItem is Abstract

+		return true;

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Signal_2081(Signal it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_UseCase_2082(UseCase it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_SignalEvent_2083(SignalEvent it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_CallEvent_2084(CallEvent it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_AnyReceiveEvent_2085(AnyReceiveEvent it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_ChangeEvent_2088(ChangeEvent it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_TimeEvent_2089(TimeEvent it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_DurationObservation_2093(DurationObservation it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_TimeObservation_2094(TimeObservation it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_LiteralBoolean_2095(LiteralBoolean it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_LiteralInteger_2096(LiteralInteger it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_LiteralNull_2097(LiteralNull it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_LiteralString_2098(LiteralString it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_LiteralUnlimitedNatural_2099(LiteralUnlimitedNatural it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_StringExpression_2100(StringExpression it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_OpaqueExpression_2101(OpaqueExpression it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_TimeExpression_2102(TimeExpression it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Expression_2103(Expression it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Duration_2104(Duration it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_TimeInterval_2105(TimeInterval it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_DurationInterval_2106(DurationInterval it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Interval_2107(Interval it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_InstanceValue_2108(InstanceValue it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String body_Comment_2109(Comment it) {

+		// Comment body init

+		return "";

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_DurationConstraint_2110(DurationConstraint it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private ValueSpecification specification_DurationConstraint_2110(DurationConstraint it) {

+		// Constraint specification init

+		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();

+		value.setValue("");

+		return value;

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_TimeConstraint_2111(TimeConstraint it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private ValueSpecification specification_TimeConstraint_2111(TimeConstraint it) {

+		// Constraint specification init

+		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();

+		value.setValue("");

+		return value;

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_IntervalConstraint_2112(IntervalConstraint it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private ValueSpecification specification_IntervalConstraint_2112(IntervalConstraint it) {

+		// Constraint specification init

+		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();

+		value.setValue("");

+		return value;

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_InteractionConstraint_2113(InteractionConstraint it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private ValueSpecification specification_InteractionConstraint_2113(InteractionConstraint it) {

+		// Constraint specification init

+		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();

+		value.setValue("");

+		return value;

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Constraint_2114(Constraint it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private ValueSpecification specification_Constraint_2114(Constraint it) {

+		// Constraint specification init

+		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();

+		value.setValue("");

+		return value;

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Port_3069(Port it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Parameter_3088(Parameter it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Property_3070(Property it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_ConnectableElement_3115(ConnectableElement it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_CollaborationUse_3071(CollaborationUse it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Activity_3072(Activity it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Interaction_3073(Interaction it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_ProtocolStateMachine_3074(ProtocolStateMachine it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_StateMachine_3075(StateMachine it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_FunctionBehavior_3076(FunctionBehavior it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_OpaqueBehavior_3077(OpaqueBehavior it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Component_3081(Component it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Device_3082(Device it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_ExecutionEnvironment_3083(ExecutionEnvironment it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Node_3084(Node it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Class_3085(Class it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Collaboration_3086(Collaboration it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Interface_3087(Interface it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_PrimitiveType_3078(PrimitiveType it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Enumeration_3079(Enumeration it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_DataType_3080(DataType it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Actor_3091(Actor it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_DeploymentSpecification_3092(DeploymentSpecification it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Artifact_3093(Artifact it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_InformationItem_3094(InformationItem it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private Boolean isAbstract_InformationItem_3094(InformationItem it) {

+		// InformationItem is Abstract

+		return true;

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Signal_3095(Signal it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_UseCase_3096(UseCase it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String body_Comment_3097(Comment it) {

+		// Comment body init

+		return "";

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_DurationConstraint_3116(DurationConstraint it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private ValueSpecification specification_DurationConstraint_3116(DurationConstraint it) {

+		// Constraint specification init

+		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();

+		value.setValue("");

+		return value;

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_TimeConstraint_3117(TimeConstraint it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private ValueSpecification specification_TimeConstraint_3117(TimeConstraint it) {

+		// Constraint specification init

+		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();

+		value.setValue("");

+		return value;

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_IntervalConstraint_3118(IntervalConstraint it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private ValueSpecification specification_IntervalConstraint_3118(IntervalConstraint it) {

+		// Constraint specification init

+		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();

+		value.setValue("");

+		return value;

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_InteractionConstraint_3119(InteractionConstraint it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private ValueSpecification specification_InteractionConstraint_3119(InteractionConstraint it) {

+		// Constraint specification init

+		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();

+		value.setValue("");

+		return value;

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Constraint_3120(Constraint it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private ValueSpecification specification_Constraint_3120(Constraint it) {

+		// Constraint specification init

+		LiteralString value = UMLFactory.eINSTANCE.createLiteralString();

+		value.setValue("");

+		return value;

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Property_3101(Property it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Operation_3102(Operation it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_EnumerationLiteral_3066(EnumerationLiteral it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_ComponentRealization_4004(ComponentRealization it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_InterfaceRealization_4005(InterfaceRealization it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Substitution_4011(Substitution it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Realization_4006(Realization it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Manifestation_4012(Manifestation it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Abstraction_4007(Abstraction it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Usage_4008(Usage it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Deployment_4009(Deployment it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Dependency_4010(Dependency it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_Connector_4013(Connector it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	private String name_InformationFlow_4021(InformationFlow it) {

+		return NamedElementUtil.getDefaultNameWithIncrementFromBase(it.eClass().getName(), it.getOwner().eContents());

+	}

+

+	/**

+	 * @generated

+	 */

+	public static ElementInitializers getInstance() {

+		ElementInitializers cached = UMLDiagramEditorPlugin.getInstance().getElementInitializers();

+		if(cached == null) {

+			UMLDiagramEditorPlugin.getInstance().setElementInitializers(cached = new ElementInitializers());

+		}

+		return cached;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLEditPartProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLEditPartProvider.java
index 90ac21dadd3..92f285b4f4d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLEditPartProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLEditPartProvider.java
@@ -1,31 +1,30 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.providers;
-
-import org.eclipse.gmf.tooling.runtime.providers.DefaultEditPartProvider;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UMLEditPartFactory;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-
-/**
- * @generated
- */
-public class UMLEditPartProvider extends DefaultEditPartProvider {
-	/**
-	 * @generated
-	 */
-	public UMLEditPartProvider() {
-		super(new UMLEditPartFactory(),
-				UMLVisualIDRegistry.TYPED_INSTANCE,
-				CompositeStructureDiagramEditPart.MODEL_ID);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.providers;

+

+import org.eclipse.gmf.tooling.runtime.providers.DefaultEditPartProvider;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.UMLEditPartFactory;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class UMLEditPartProvider extends DefaultEditPartProvider {

+

+	/**

+	 * @generated

+	 */

+	public UMLEditPartProvider() {

+		super(new UMLEditPartFactory(), UMLVisualIDRegistry.TYPED_INSTANCE, CompositeStructureDiagramEditPart.MODEL_ID);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLElementTypes.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLElementTypes.java
index edafa2b36d4..e675866ed0f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLElementTypes.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLElementTypes.java
@@ -1,1002 +1,1315 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.providers;
-
-import java.util.HashSet;
-import java.util.IdentityHashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.tooling.runtime.providers.DiagramElementTypeImages;
-import org.eclipse.gmf.tooling.runtime.providers.DiagramElementTypes;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.*;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class UMLElementTypes {
-	/**
-	 * @generated
-	 */
-	private UMLElementTypes() {
-	}
-
-	/**
-	 * @generated
-	 */
-	private static Map<IElementType, ENamedElement> elements;
-	/**
-	 * @generated
-	 */
-	private static DiagramElementTypeImages elementTypeImages = new DiagramElementTypeImages(UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory());
-	/**
-	 * @generated
-	 */
-	private static Set<IElementType> KNOWN_ELEMENT_TYPES;
-	/**
-	 * @generated
-	 */
-	public static final IElementType Package_1000 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Package_1000"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Activity_2060 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Activity_2060"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Interaction_2061 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Interaction_2061"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType ProtocolStateMachine_2062 = getElementType("org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_2062"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType StateMachine_2063 = getElementType("org.eclipse.papyrus.uml.diagram.composite.StateMachine_2063"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType FunctionBehavior_2064 = getElementType("org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_2064"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType OpaqueBehavior_2065 = getElementType("org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_2065"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Component_2069 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Component_2069"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Device_2070 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Device_2070"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType ExecutionEnvironment_2071 = getElementType("org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_2071"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Node_2072 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Node_2072"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Class_2073 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Class_2073"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Collaboration_2075 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Collaboration_2075"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Interface_2076 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Interface_2076"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType PrimitiveType_2066 = getElementType("org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_2066"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Enumeration_2067 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Enumeration_2067"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType DataType_2068 = getElementType("org.eclipse.papyrus.uml.diagram.composite.DataType_2068"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Actor_2077 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Actor_2077"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType DeploymentSpecification_2078 = getElementType("org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_2078"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Artifact_2079 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Artifact_2079"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType InformationItem_2080 = getElementType("org.eclipse.papyrus.uml.diagram.composite.InformationItem_2080"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Signal_2081 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Signal_2081"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType UseCase_2082 = getElementType("org.eclipse.papyrus.uml.diagram.composite.UseCase_2082"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType SignalEvent_2083 = getElementType("org.eclipse.papyrus.uml.diagram.composite.SignalEvent_2083"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType CallEvent_2084 = getElementType("org.eclipse.papyrus.uml.diagram.composite.CallEvent_2084"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType AnyReceiveEvent_2085 = getElementType("org.eclipse.papyrus.uml.diagram.composite.AnyReceiveEvent_2085"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType ChangeEvent_2088 = getElementType("org.eclipse.papyrus.uml.diagram.composite.ChangeEvent_2088"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType TimeEvent_2089 = getElementType("org.eclipse.papyrus.uml.diagram.composite.TimeEvent_2089"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType DurationObservation_2093 = getElementType("org.eclipse.papyrus.uml.diagram.composite.DurationObservation_2093"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType TimeObservation_2094 = getElementType("org.eclipse.papyrus.uml.diagram.composite.TimeObservation_2094"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType LiteralBoolean_2095 = getElementType("org.eclipse.papyrus.uml.diagram.composite.LiteralBoolean_2095"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType LiteralInteger_2096 = getElementType("org.eclipse.papyrus.uml.diagram.composite.LiteralInteger_2096"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType LiteralNull_2097 = getElementType("org.eclipse.papyrus.uml.diagram.composite.LiteralNull_2097"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType LiteralString_2098 = getElementType("org.eclipse.papyrus.uml.diagram.composite.LiteralString_2098"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType LiteralUnlimitedNatural_2099 = getElementType("org.eclipse.papyrus.uml.diagram.composite.LiteralUnlimitedNatural_2099"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType StringExpression_2100 = getElementType("org.eclipse.papyrus.uml.diagram.composite.StringExpression_2100"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType OpaqueExpression_2101 = getElementType("org.eclipse.papyrus.uml.diagram.composite.OpaqueExpression_2101"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType TimeExpression_2102 = getElementType("org.eclipse.papyrus.uml.diagram.composite.TimeExpression_2102"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Expression_2103 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Expression_2103"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Duration_2104 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Duration_2104"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType TimeInterval_2105 = getElementType("org.eclipse.papyrus.uml.diagram.composite.TimeInterval_2105"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType DurationInterval_2106 = getElementType("org.eclipse.papyrus.uml.diagram.composite.DurationInterval_2106"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Interval_2107 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Interval_2107"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType InstanceValue_2108 = getElementType("org.eclipse.papyrus.uml.diagram.composite.InstanceValue_2108"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Comment_2109 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Comment_2109"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType DurationConstraint_2110 = getElementType("org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_2110"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType TimeConstraint_2111 = getElementType("org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_2111"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType IntervalConstraint_2112 = getElementType("org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_2112"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType InteractionConstraint_2113 = getElementType("org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_2113"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Constraint_2114 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Constraint_2114"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Node_3121 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Node_3121"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Port_3069 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Port_3069"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Parameter_3088 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Parameter_3088"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Property_3070 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Property_3070"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType ConnectableElement_3115 = getElementType("org.eclipse.papyrus.uml.diagram.composite.prototype.CollaborationRole_3115"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType CollaborationUse_3071 = getElementType("org.eclipse.papyrus.uml.diagram.composite.CollaborationUse_3071"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Activity_3072 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Activity_3072"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Interaction_3073 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Interaction_3073"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType ProtocolStateMachine_3074 = getElementType("org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_3074"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType StateMachine_3075 = getElementType("org.eclipse.papyrus.uml.diagram.composite.StateMachine_3075"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType FunctionBehavior_3076 = getElementType("org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_3076"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType OpaqueBehavior_3077 = getElementType("org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_3077"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Component_3081 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Component_3081"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Device_3082 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Device_3082"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType ExecutionEnvironment_3083 = getElementType("org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_3083"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Node_3084 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Node_3084"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Class_3085 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Class_3085"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Collaboration_3086 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Collaboration_3086"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Interface_3087 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Interface_3087"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType PrimitiveType_3078 = getElementType("org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_3078"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Enumeration_3079 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Enumeration_3079"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType DataType_3080 = getElementType("org.eclipse.papyrus.uml.diagram.composite.DataType_3080"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Actor_3091 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Actor_3091"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType DeploymentSpecification_3092 = getElementType("org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_3092"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Artifact_3093 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Artifact_3093"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType InformationItem_3094 = getElementType("org.eclipse.papyrus.uml.diagram.composite.InformationItem_3094"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Signal_3095 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Signal_3095"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType UseCase_3096 = getElementType("org.eclipse.papyrus.uml.diagram.composite.UseCase_3096"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Comment_3097 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Comment_3097"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType DurationConstraint_3116 = getElementType("org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_3116"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType TimeConstraint_3117 = getElementType("org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_3117"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType IntervalConstraint_3118 = getElementType("org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_3118"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType InteractionConstraint_3119 = getElementType("org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_3119"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Constraint_3120 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Constraint_3120"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Property_3101 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Property_3101"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Operation_3102 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Operation_3102"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType EnumerationLiteral_3066 = getElementType("org.eclipse.papyrus.uml.diagram.composite.EnumerationLiteral_3066"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Link_4022 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Link_4022"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Link_4001 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Link_4001"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType CommentAnnotatedElement_4002 = getElementType("org.eclipse.papyrus.uml.diagram.composite.CommentAnnotatedElement_4002"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType ConstraintConstrainedElement_4003 = getElementType("org.eclipse.papyrus.uml.diagram.composite.ConstraintConstrainedElement_4003"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType ComponentRealization_4004 = getElementType("org.eclipse.papyrus.uml.diagram.composite.ComponentRealization_4004"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType InterfaceRealization_4005 = getElementType("org.eclipse.papyrus.uml.diagram.composite.InterfaceRealization_4005"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Substitution_4011 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Substitution_4011"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Realization_4006 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Realization_4006"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Manifestation_4012 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Manifestation_4012"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Abstraction_4007 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Usage_4008 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Usage_4008"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Deployment_4009 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Deployment_4009"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Dependency_4017 = getElementType("org.eclipse.papyrus.uml.diagram.composite.RoleBinding_4017"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Dependency_4010 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Dependency_4010"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Connector_4013 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Connector_4013"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType Generalization_4015 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Generalization_4015"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType TimeObservationEvent_4018 = getElementType("org.eclipse.papyrus.uml.diagram.composite.TimeObservationEvent_4018"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType DurationObservationEvent_4019 = getElementType("org.eclipse.papyrus.uml.diagram.composite.DurationObservationEvent_4019"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType InformationItemRepresented_4020 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Representation_4020"); //$NON-NLS-1$
-	/**
-	 * @generated
-	 */
-	public static final IElementType InformationFlow_4021 = getElementType("org.eclipse.papyrus.uml.diagram.composite.InformationFlow_4021"); //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	public static ImageDescriptor getImageDescriptor(ENamedElement element) {
-		return elementTypeImages.getImageDescriptor(element);
-	}
-
-	/**
-	 * @generated
-	 */
-	public static Image getImage(ENamedElement element) {
-		return elementTypeImages.getImage(element);
-	}
-
-	/**
-	 * @generated
-	 */
-	public static ImageDescriptor getImageDescriptor(IAdaptable hint) {
-		return getImageDescriptor(getElement(hint));
-	}
-
-	/**
-	 * @generated
-	 */
-	public static Image getImage(IAdaptable hint) {
-		return getImage(getElement(hint));
-	}
-
-	/**
-	 * Returns 'type' of the ecore object associated with the hint.
-	 * 
-	 * @generated
-	 */
-	public static synchronized ENamedElement getElement(IAdaptable hint) {
-		Object type = hint.getAdapter(IElementType.class);
-		if (elements == null) {
-			elements = new IdentityHashMap<IElementType, ENamedElement>();
-			elements.put(Package_1000, UMLPackage.eINSTANCE.getPackage());
-			elements.put(Activity_2060, UMLPackage.eINSTANCE.getActivity());
-			elements.put(Interaction_2061, UMLPackage.eINSTANCE.getInteraction());
-			elements.put(ProtocolStateMachine_2062, UMLPackage.eINSTANCE.getProtocolStateMachine());
-			elements.put(StateMachine_2063, UMLPackage.eINSTANCE.getStateMachine());
-			elements.put(FunctionBehavior_2064, UMLPackage.eINSTANCE.getFunctionBehavior());
-			elements.put(OpaqueBehavior_2065, UMLPackage.eINSTANCE.getOpaqueBehavior());
-			elements.put(Component_2069, UMLPackage.eINSTANCE.getComponent());
-			elements.put(Device_2070, UMLPackage.eINSTANCE.getDevice());
-			elements.put(ExecutionEnvironment_2071, UMLPackage.eINSTANCE.getExecutionEnvironment());
-			elements.put(Node_2072, UMLPackage.eINSTANCE.getNode());
-			elements.put(Class_2073, UMLPackage.eINSTANCE.getClass_());
-			elements.put(Collaboration_2075, UMLPackage.eINSTANCE.getCollaboration());
-			elements.put(Interface_2076, UMLPackage.eINSTANCE.getInterface());
-			elements.put(PrimitiveType_2066, UMLPackage.eINSTANCE.getPrimitiveType());
-			elements.put(Enumeration_2067, UMLPackage.eINSTANCE.getEnumeration());
-			elements.put(DataType_2068, UMLPackage.eINSTANCE.getDataType());
-			elements.put(Actor_2077, UMLPackage.eINSTANCE.getActor());
-			elements.put(DeploymentSpecification_2078, UMLPackage.eINSTANCE.getDeploymentSpecification());
-			elements.put(Artifact_2079, UMLPackage.eINSTANCE.getArtifact());
-			elements.put(InformationItem_2080, UMLPackage.eINSTANCE.getInformationItem());
-			elements.put(Signal_2081, UMLPackage.eINSTANCE.getSignal());
-			elements.put(UseCase_2082, UMLPackage.eINSTANCE.getUseCase());
-			elements.put(SignalEvent_2083, UMLPackage.eINSTANCE.getSignalEvent());
-			elements.put(CallEvent_2084, UMLPackage.eINSTANCE.getCallEvent());
-			elements.put(AnyReceiveEvent_2085, UMLPackage.eINSTANCE.getAnyReceiveEvent());
-			elements.put(ChangeEvent_2088, UMLPackage.eINSTANCE.getChangeEvent());
-			elements.put(TimeEvent_2089, UMLPackage.eINSTANCE.getTimeEvent());
-			elements.put(DurationObservation_2093, UMLPackage.eINSTANCE.getDurationObservation());
-			elements.put(TimeObservation_2094, UMLPackage.eINSTANCE.getTimeObservation());
-			elements.put(LiteralBoolean_2095, UMLPackage.eINSTANCE.getLiteralBoolean());
-			elements.put(LiteralInteger_2096, UMLPackage.eINSTANCE.getLiteralInteger());
-			elements.put(LiteralNull_2097, UMLPackage.eINSTANCE.getLiteralNull());
-			elements.put(LiteralString_2098, UMLPackage.eINSTANCE.getLiteralString());
-			elements.put(LiteralUnlimitedNatural_2099, UMLPackage.eINSTANCE.getLiteralUnlimitedNatural());
-			elements.put(StringExpression_2100, UMLPackage.eINSTANCE.getStringExpression());
-			elements.put(OpaqueExpression_2101, UMLPackage.eINSTANCE.getOpaqueExpression());
-			elements.put(TimeExpression_2102, UMLPackage.eINSTANCE.getTimeExpression());
-			elements.put(Expression_2103, UMLPackage.eINSTANCE.getExpression());
-			elements.put(Duration_2104, UMLPackage.eINSTANCE.getDuration());
-			elements.put(TimeInterval_2105, UMLPackage.eINSTANCE.getTimeInterval());
-			elements.put(DurationInterval_2106, UMLPackage.eINSTANCE.getDurationInterval());
-			elements.put(Interval_2107, UMLPackage.eINSTANCE.getInterval());
-			elements.put(InstanceValue_2108, UMLPackage.eINSTANCE.getInstanceValue());
-			elements.put(Comment_2109, UMLPackage.eINSTANCE.getComment());
-			elements.put(DurationConstraint_2110, UMLPackage.eINSTANCE.getDurationConstraint());
-			elements.put(TimeConstraint_2111, UMLPackage.eINSTANCE.getTimeConstraint());
-			elements.put(IntervalConstraint_2112, UMLPackage.eINSTANCE.getIntervalConstraint());
-			elements.put(InteractionConstraint_2113, UMLPackage.eINSTANCE.getInteractionConstraint());
-			elements.put(Constraint_2114, UMLPackage.eINSTANCE.getConstraint());
-			elements.put(Port_3069, UMLPackage.eINSTANCE.getPort());
-			elements.put(Parameter_3088, UMLPackage.eINSTANCE.getParameter());
-			elements.put(Property_3070, UMLPackage.eINSTANCE.getProperty());
-			elements.put(ConnectableElement_3115, UMLPackage.eINSTANCE.getConnectableElement());
-			elements.put(CollaborationUse_3071, UMLPackage.eINSTANCE.getCollaborationUse());
-			elements.put(Activity_3072, UMLPackage.eINSTANCE.getActivity());
-			elements.put(Interaction_3073, UMLPackage.eINSTANCE.getInteraction());
-			elements.put(ProtocolStateMachine_3074, UMLPackage.eINSTANCE.getProtocolStateMachine());
-			elements.put(StateMachine_3075, UMLPackage.eINSTANCE.getStateMachine());
-			elements.put(FunctionBehavior_3076, UMLPackage.eINSTANCE.getFunctionBehavior());
-			elements.put(OpaqueBehavior_3077, UMLPackage.eINSTANCE.getOpaqueBehavior());
-			elements.put(Component_3081, UMLPackage.eINSTANCE.getComponent());
-			elements.put(Device_3082, UMLPackage.eINSTANCE.getDevice());
-			elements.put(ExecutionEnvironment_3083, UMLPackage.eINSTANCE.getExecutionEnvironment());
-			elements.put(Node_3084, UMLPackage.eINSTANCE.getNode());
-			elements.put(Class_3085, UMLPackage.eINSTANCE.getClass_());
-			elements.put(Collaboration_3086, UMLPackage.eINSTANCE.getCollaboration());
-			elements.put(Interface_3087, UMLPackage.eINSTANCE.getInterface());
-			elements.put(PrimitiveType_3078, UMLPackage.eINSTANCE.getPrimitiveType());
-			elements.put(Enumeration_3079, UMLPackage.eINSTANCE.getEnumeration());
-			elements.put(DataType_3080, UMLPackage.eINSTANCE.getDataType());
-			elements.put(Actor_3091, UMLPackage.eINSTANCE.getActor());
-			elements.put(DeploymentSpecification_3092, UMLPackage.eINSTANCE.getDeploymentSpecification());
-			elements.put(Artifact_3093, UMLPackage.eINSTANCE.getArtifact());
-			elements.put(InformationItem_3094, UMLPackage.eINSTANCE.getInformationItem());
-			elements.put(Signal_3095, UMLPackage.eINSTANCE.getSignal());
-			elements.put(UseCase_3096, UMLPackage.eINSTANCE.getUseCase());
-			elements.put(Comment_3097, UMLPackage.eINSTANCE.getComment());
-			elements.put(DurationConstraint_3116, UMLPackage.eINSTANCE.getDurationConstraint());
-			elements.put(TimeConstraint_3117, UMLPackage.eINSTANCE.getTimeConstraint());
-			elements.put(IntervalConstraint_3118, UMLPackage.eINSTANCE.getIntervalConstraint());
-			elements.put(InteractionConstraint_3119, UMLPackage.eINSTANCE.getInteractionConstraint());
-			elements.put(Constraint_3120, UMLPackage.eINSTANCE.getConstraint());
-			elements.put(Property_3101, UMLPackage.eINSTANCE.getProperty());
-			elements.put(Operation_3102, UMLPackage.eINSTANCE.getOperation());
-			elements.put(EnumerationLiteral_3066, UMLPackage.eINSTANCE.getEnumerationLiteral());
-			elements.put(CommentAnnotatedElement_4002, UMLPackage.eINSTANCE.getComment_AnnotatedElement());
-			elements.put(ConstraintConstrainedElement_4003, UMLPackage.eINSTANCE.getConstraint_ConstrainedElement());
-			elements.put(ComponentRealization_4004, UMLPackage.eINSTANCE.getComponentRealization());
-			elements.put(InterfaceRealization_4005, UMLPackage.eINSTANCE.getInterfaceRealization());
-			elements.put(Substitution_4011, UMLPackage.eINSTANCE.getSubstitution());
-			elements.put(Realization_4006, UMLPackage.eINSTANCE.getRealization());
-			elements.put(Manifestation_4012, UMLPackage.eINSTANCE.getManifestation());
-			elements.put(Abstraction_4007, UMLPackage.eINSTANCE.getAbstraction());
-			elements.put(Usage_4008, UMLPackage.eINSTANCE.getUsage());
-			elements.put(Deployment_4009, UMLPackage.eINSTANCE.getDeployment());
-			elements.put(Dependency_4017, UMLPackage.eINSTANCE.getDependency());
-			elements.put(Dependency_4010, UMLPackage.eINSTANCE.getDependency());
-			elements.put(Connector_4013, UMLPackage.eINSTANCE.getConnector());
-			elements.put(Generalization_4015, UMLPackage.eINSTANCE.getGeneralization());
-			elements.put(TimeObservationEvent_4018, UMLPackage.eINSTANCE.getTimeObservation_Event());
-			elements.put(DurationObservationEvent_4019, UMLPackage.eINSTANCE.getDurationObservation_Event());
-			elements.put(InformationItemRepresented_4020, UMLPackage.eINSTANCE.getInformationItem_Represented());
-			elements.put(InformationFlow_4021, UMLPackage.eINSTANCE.getInformationFlow());
-		}
-		return (ENamedElement) elements.get(type);
-	}
-
-	/**
-	 * @generated
-	 */
-	private static IElementType getElementType(String id) {
-		return ElementTypeRegistry.getInstance().getType(id);
-	}
-
-	/**
-	 * @generated
-	 */
-	public static synchronized boolean isKnownElementType(IElementType elementType) {
-		if (KNOWN_ELEMENT_TYPES == null) {
-			KNOWN_ELEMENT_TYPES = new HashSet<IElementType>();
-			KNOWN_ELEMENT_TYPES.add(Package_1000);
-			KNOWN_ELEMENT_TYPES.add(Activity_2060);
-			KNOWN_ELEMENT_TYPES.add(Interaction_2061);
-			KNOWN_ELEMENT_TYPES.add(ProtocolStateMachine_2062);
-			KNOWN_ELEMENT_TYPES.add(StateMachine_2063);
-			KNOWN_ELEMENT_TYPES.add(FunctionBehavior_2064);
-			KNOWN_ELEMENT_TYPES.add(OpaqueBehavior_2065);
-			KNOWN_ELEMENT_TYPES.add(Component_2069);
-			KNOWN_ELEMENT_TYPES.add(Device_2070);
-			KNOWN_ELEMENT_TYPES.add(ExecutionEnvironment_2071);
-			KNOWN_ELEMENT_TYPES.add(Node_2072);
-			KNOWN_ELEMENT_TYPES.add(Class_2073);
-			KNOWN_ELEMENT_TYPES.add(Collaboration_2075);
-			KNOWN_ELEMENT_TYPES.add(Interface_2076);
-			KNOWN_ELEMENT_TYPES.add(PrimitiveType_2066);
-			KNOWN_ELEMENT_TYPES.add(Enumeration_2067);
-			KNOWN_ELEMENT_TYPES.add(DataType_2068);
-			KNOWN_ELEMENT_TYPES.add(Actor_2077);
-			KNOWN_ELEMENT_TYPES.add(DeploymentSpecification_2078);
-			KNOWN_ELEMENT_TYPES.add(Artifact_2079);
-			KNOWN_ELEMENT_TYPES.add(InformationItem_2080);
-			KNOWN_ELEMENT_TYPES.add(Signal_2081);
-			KNOWN_ELEMENT_TYPES.add(UseCase_2082);
-			KNOWN_ELEMENT_TYPES.add(SignalEvent_2083);
-			KNOWN_ELEMENT_TYPES.add(CallEvent_2084);
-			KNOWN_ELEMENT_TYPES.add(AnyReceiveEvent_2085);
-			KNOWN_ELEMENT_TYPES.add(ChangeEvent_2088);
-			KNOWN_ELEMENT_TYPES.add(TimeEvent_2089);
-			KNOWN_ELEMENT_TYPES.add(DurationObservation_2093);
-			KNOWN_ELEMENT_TYPES.add(TimeObservation_2094);
-			KNOWN_ELEMENT_TYPES.add(LiteralBoolean_2095);
-			KNOWN_ELEMENT_TYPES.add(LiteralInteger_2096);
-			KNOWN_ELEMENT_TYPES.add(LiteralNull_2097);
-			KNOWN_ELEMENT_TYPES.add(LiteralString_2098);
-			KNOWN_ELEMENT_TYPES.add(LiteralUnlimitedNatural_2099);
-			KNOWN_ELEMENT_TYPES.add(StringExpression_2100);
-			KNOWN_ELEMENT_TYPES.add(OpaqueExpression_2101);
-			KNOWN_ELEMENT_TYPES.add(TimeExpression_2102);
-			KNOWN_ELEMENT_TYPES.add(Expression_2103);
-			KNOWN_ELEMENT_TYPES.add(Duration_2104);
-			KNOWN_ELEMENT_TYPES.add(TimeInterval_2105);
-			KNOWN_ELEMENT_TYPES.add(DurationInterval_2106);
-			KNOWN_ELEMENT_TYPES.add(Interval_2107);
-			KNOWN_ELEMENT_TYPES.add(InstanceValue_2108);
-			KNOWN_ELEMENT_TYPES.add(Comment_2109);
-			KNOWN_ELEMENT_TYPES.add(DurationConstraint_2110);
-			KNOWN_ELEMENT_TYPES.add(TimeConstraint_2111);
-			KNOWN_ELEMENT_TYPES.add(IntervalConstraint_2112);
-			KNOWN_ELEMENT_TYPES.add(InteractionConstraint_2113);
-			KNOWN_ELEMENT_TYPES.add(Constraint_2114);
-			KNOWN_ELEMENT_TYPES.add(Node_3121);
-			KNOWN_ELEMENT_TYPES.add(Port_3069);
-			KNOWN_ELEMENT_TYPES.add(Parameter_3088);
-			KNOWN_ELEMENT_TYPES.add(Property_3070);
-			KNOWN_ELEMENT_TYPES.add(ConnectableElement_3115);
-			KNOWN_ELEMENT_TYPES.add(CollaborationUse_3071);
-			KNOWN_ELEMENT_TYPES.add(Activity_3072);
-			KNOWN_ELEMENT_TYPES.add(Interaction_3073);
-			KNOWN_ELEMENT_TYPES.add(ProtocolStateMachine_3074);
-			KNOWN_ELEMENT_TYPES.add(StateMachine_3075);
-			KNOWN_ELEMENT_TYPES.add(FunctionBehavior_3076);
-			KNOWN_ELEMENT_TYPES.add(OpaqueBehavior_3077);
-			KNOWN_ELEMENT_TYPES.add(Component_3081);
-			KNOWN_ELEMENT_TYPES.add(Device_3082);
-			KNOWN_ELEMENT_TYPES.add(ExecutionEnvironment_3083);
-			KNOWN_ELEMENT_TYPES.add(Node_3084);
-			KNOWN_ELEMENT_TYPES.add(Class_3085);
-			KNOWN_ELEMENT_TYPES.add(Collaboration_3086);
-			KNOWN_ELEMENT_TYPES.add(Interface_3087);
-			KNOWN_ELEMENT_TYPES.add(PrimitiveType_3078);
-			KNOWN_ELEMENT_TYPES.add(Enumeration_3079);
-			KNOWN_ELEMENT_TYPES.add(DataType_3080);
-			KNOWN_ELEMENT_TYPES.add(Actor_3091);
-			KNOWN_ELEMENT_TYPES.add(DeploymentSpecification_3092);
-			KNOWN_ELEMENT_TYPES.add(Artifact_3093);
-			KNOWN_ELEMENT_TYPES.add(InformationItem_3094);
-			KNOWN_ELEMENT_TYPES.add(Signal_3095);
-			KNOWN_ELEMENT_TYPES.add(UseCase_3096);
-			KNOWN_ELEMENT_TYPES.add(Comment_3097);
-			KNOWN_ELEMENT_TYPES.add(DurationConstraint_3116);
-			KNOWN_ELEMENT_TYPES.add(TimeConstraint_3117);
-			KNOWN_ELEMENT_TYPES.add(IntervalConstraint_3118);
-			KNOWN_ELEMENT_TYPES.add(InteractionConstraint_3119);
-			KNOWN_ELEMENT_TYPES.add(Constraint_3120);
-			KNOWN_ELEMENT_TYPES.add(Property_3101);
-			KNOWN_ELEMENT_TYPES.add(Operation_3102);
-			KNOWN_ELEMENT_TYPES.add(EnumerationLiteral_3066);
-			KNOWN_ELEMENT_TYPES.add(Link_4022);
-			KNOWN_ELEMENT_TYPES.add(Link_4001);
-			KNOWN_ELEMENT_TYPES.add(CommentAnnotatedElement_4002);
-			KNOWN_ELEMENT_TYPES.add(ConstraintConstrainedElement_4003);
-			KNOWN_ELEMENT_TYPES.add(ComponentRealization_4004);
-			KNOWN_ELEMENT_TYPES.add(InterfaceRealization_4005);
-			KNOWN_ELEMENT_TYPES.add(Substitution_4011);
-			KNOWN_ELEMENT_TYPES.add(Realization_4006);
-			KNOWN_ELEMENT_TYPES.add(Manifestation_4012);
-			KNOWN_ELEMENT_TYPES.add(Abstraction_4007);
-			KNOWN_ELEMENT_TYPES.add(Usage_4008);
-			KNOWN_ELEMENT_TYPES.add(Deployment_4009);
-			KNOWN_ELEMENT_TYPES.add(Dependency_4017);
-			KNOWN_ELEMENT_TYPES.add(Dependency_4010);
-			KNOWN_ELEMENT_TYPES.add(Connector_4013);
-			KNOWN_ELEMENT_TYPES.add(Generalization_4015);
-			KNOWN_ELEMENT_TYPES.add(TimeObservationEvent_4018);
-			KNOWN_ELEMENT_TYPES.add(DurationObservationEvent_4019);
-			KNOWN_ELEMENT_TYPES.add(InformationItemRepresented_4020);
-			KNOWN_ELEMENT_TYPES.add(InformationFlow_4021);
-		}
-		return KNOWN_ELEMENT_TYPES.contains(elementType);
-	}
-
-	/**
-	 * @generated
-	 */
-	public static IElementType getElementType(int visualID) {
-		switch (visualID) {
-		case CompositeStructureDiagramEditPart.VISUAL_ID:
-			return Package_1000;
-		case ActivityCompositeEditPart.VISUAL_ID:
-			return Activity_2060;
-		case InteractionCompositeEditPart.VISUAL_ID:
-			return Interaction_2061;
-		case ProtocolStateMachineCompositeEditPart.VISUAL_ID:
-			return ProtocolStateMachine_2062;
-		case StateMachineCompositeEditPart.VISUAL_ID:
-			return StateMachine_2063;
-		case FunctionBehaviorCompositeEditPart.VISUAL_ID:
-			return FunctionBehavior_2064;
-		case OpaqueBehaviorCompositeEditPart.VISUAL_ID:
-			return OpaqueBehavior_2065;
-		case ComponentCompositeEditPart.VISUAL_ID:
-			return Component_2069;
-		case DeviceCompositeEditPart.VISUAL_ID:
-			return Device_2070;
-		case ExecutionEnvironmentCompositeEditPart.VISUAL_ID:
-			return ExecutionEnvironment_2071;
-		case NodeCompositeEditPart.VISUAL_ID:
-			return Node_2072;
-		case ClassCompositeEditPart.VISUAL_ID:
-			return Class_2073;
-		case CollaborationCompositeEditPart.VISUAL_ID:
-			return Collaboration_2075;
-		case InterfaceEditPart.VISUAL_ID:
-			return Interface_2076;
-		case PrimitiveTypeEditPart.VISUAL_ID:
-			return PrimitiveType_2066;
-		case EnumerationEditPart.VISUAL_ID:
-			return Enumeration_2067;
-		case DataTypeEditPart.VISUAL_ID:
-			return DataType_2068;
-		case ActorEditPart.VISUAL_ID:
-			return Actor_2077;
-		case DeploymentSpecificationEditPart.VISUAL_ID:
-			return DeploymentSpecification_2078;
-		case ArtifactEditPart.VISUAL_ID:
-			return Artifact_2079;
-		case InformationItemEditPart.VISUAL_ID:
-			return InformationItem_2080;
-		case SignalEditPart.VISUAL_ID:
-			return Signal_2081;
-		case UseCaseEditPart.VISUAL_ID:
-			return UseCase_2082;
-		case SignalEventEditPart.VISUAL_ID:
-			return SignalEvent_2083;
-		case CallEventEditPart.VISUAL_ID:
-			return CallEvent_2084;
-		case AnyReceiveEventEditPart.VISUAL_ID:
-			return AnyReceiveEvent_2085;
-		case ChangeEventEditPart.VISUAL_ID:
-			return ChangeEvent_2088;
-		case TimeEventEditPart.VISUAL_ID:
-			return TimeEvent_2089;
-		case DurationObservationEditPart.VISUAL_ID:
-			return DurationObservation_2093;
-		case TimeObservationEditPart.VISUAL_ID:
-			return TimeObservation_2094;
-		case LiteralBooleanEditPart.VISUAL_ID:
-			return LiteralBoolean_2095;
-		case LiteralIntegerEditPart.VISUAL_ID:
-			return LiteralInteger_2096;
-		case LiteralNullEditPart.VISUAL_ID:
-			return LiteralNull_2097;
-		case LiteralStringEditPart.VISUAL_ID:
-			return LiteralString_2098;
-		case LiteralUnlimitedNaturalEditPart.VISUAL_ID:
-			return LiteralUnlimitedNatural_2099;
-		case StringExpressionEditPart.VISUAL_ID:
-			return StringExpression_2100;
-		case OpaqueExpressionEditPart.VISUAL_ID:
-			return OpaqueExpression_2101;
-		case TimeExpressionEditPart.VISUAL_ID:
-			return TimeExpression_2102;
-		case ExpressionEditPart.VISUAL_ID:
-			return Expression_2103;
-		case DurationEditPart.VISUAL_ID:
-			return Duration_2104;
-		case TimeIntervalEditPart.VISUAL_ID:
-			return TimeInterval_2105;
-		case DurationIntervalEditPart.VISUAL_ID:
-			return DurationInterval_2106;
-		case IntervalEditPart.VISUAL_ID:
-			return Interval_2107;
-		case InstanceValueEditPart.VISUAL_ID:
-			return InstanceValue_2108;
-		case CommentEditPart.VISUAL_ID:
-			return Comment_2109;
-		case DurationConstraintEditPart.VISUAL_ID:
-			return DurationConstraint_2110;
-		case TimeConstraintEditPart.VISUAL_ID:
-			return TimeConstraint_2111;
-		case IntervalConstraintEditPart.VISUAL_ID:
-			return IntervalConstraint_2112;
-		case InteractionConstraintEditPart.VISUAL_ID:
-			return InteractionConstraint_2113;
-		case ConstraintEditPart.VISUAL_ID:
-			return Constraint_2114;
-		case BehaviorPortEditPart.VISUAL_ID:
-			return Node_3121;
-		case PortEditPart.VISUAL_ID:
-			return Port_3069;
-		case ParameterEditPart.VISUAL_ID:
-			return Parameter_3088;
-		case PropertyPartEditPartCN.VISUAL_ID:
-			return Property_3070;
-		case CollaborationRoleEditPartCN.VISUAL_ID:
-			return ConnectableElement_3115;
-		case CollaborationUseEditPartCN.VISUAL_ID:
-			return CollaborationUse_3071;
-		case ActivityCompositeEditPartCN.VISUAL_ID:
-			return Activity_3072;
-		case InteractionCompositeEditPartCN.VISUAL_ID:
-			return Interaction_3073;
-		case ProtocolStateMachineCompositeEditPartCN.VISUAL_ID:
-			return ProtocolStateMachine_3074;
-		case StateMachineCompositeEditPartCN.VISUAL_ID:
-			return StateMachine_3075;
-		case FunctionBehaviorCompositeEditPartCN.VISUAL_ID:
-			return FunctionBehavior_3076;
-		case OpaqueBehaviorCompositeEditPartCN.VISUAL_ID:
-			return OpaqueBehavior_3077;
-		case ComponentCompositeEditPartCN.VISUAL_ID:
-			return Component_3081;
-		case DeviceCompositeEditPartCN.VISUAL_ID:
-			return Device_3082;
-		case ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID:
-			return ExecutionEnvironment_3083;
-		case NodeCompositeEditPartCN.VISUAL_ID:
-			return Node_3084;
-		case ClassCompositeEditPartCN.VISUAL_ID:
-			return Class_3085;
-		case CollaborationCompositeEditPartCN.VISUAL_ID:
-			return Collaboration_3086;
-		case InterfaceEditPartCN.VISUAL_ID:
-			return Interface_3087;
-		case PrimitiveTypeEditPartCN.VISUAL_ID:
-			return PrimitiveType_3078;
-		case EnumerationEditPartCN.VISUAL_ID:
-			return Enumeration_3079;
-		case DataTypeEditPartCN.VISUAL_ID:
-			return DataType_3080;
-		case ActorEditPartCN.VISUAL_ID:
-			return Actor_3091;
-		case DeploymentSpecificationEditPartCN.VISUAL_ID:
-			return DeploymentSpecification_3092;
-		case ArtifactEditPartCN.VISUAL_ID:
-			return Artifact_3093;
-		case InformationItemEditPartCN.VISUAL_ID:
-			return InformationItem_3094;
-		case SignalEditPartCN.VISUAL_ID:
-			return Signal_3095;
-		case UseCaseEditPartCN.VISUAL_ID:
-			return UseCase_3096;
-		case CommentEditPartCN.VISUAL_ID:
-			return Comment_3097;
-		case DurationConstraintEditPartCN.VISUAL_ID:
-			return DurationConstraint_3116;
-		case TimeConstraintEditPartCN.VISUAL_ID:
-			return TimeConstraint_3117;
-		case IntervalConstraintEditPartCN.VISUAL_ID:
-			return IntervalConstraint_3118;
-		case InteractionConstraintEditPartCN.VISUAL_ID:
-			return InteractionConstraint_3119;
-		case ConstraintEditPartCN.VISUAL_ID:
-			return Constraint_3120;
-		case PropertyEditPartCLN.VISUAL_ID:
-			return Property_3101;
-		case OperationEditPartCLN.VISUAL_ID:
-			return Operation_3102;
-		case EnumerationLiteralEditPartCLN.VISUAL_ID:
-			return EnumerationLiteral_3066;
-		case BehaviorPortLinkEditPart.VISUAL_ID:
-			return Link_4022;
-		case LinkDescriptorEditPart.VISUAL_ID:
-			return Link_4001;
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return CommentAnnotatedElement_4002;
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return ConstraintConstrainedElement_4003;
-		case ComponentRealizationEditPart.VISUAL_ID:
-			return ComponentRealization_4004;
-		case InterfaceRealizationEditPart.VISUAL_ID:
-			return InterfaceRealization_4005;
-		case SubstitutionEditPart.VISUAL_ID:
-			return Substitution_4011;
-		case RealizationEditPart.VISUAL_ID:
-			return Realization_4006;
-		case ManifestationEditPart.VISUAL_ID:
-			return Manifestation_4012;
-		case AbstractionEditPart.VISUAL_ID:
-			return Abstraction_4007;
-		case UsageEditPart.VISUAL_ID:
-			return Usage_4008;
-		case DeploymentEditPart.VISUAL_ID:
-			return Deployment_4009;
-		case RoleBindingEditPart.VISUAL_ID:
-			return Dependency_4017;
-		case DependencyEditPart.VISUAL_ID:
-			return Dependency_4010;
-		case ConnectorEditPart.VISUAL_ID:
-			return Connector_4013;
-		case GeneralizationEditPart.VISUAL_ID:
-			return Generalization_4015;
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return TimeObservationEvent_4018;
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return DurationObservationEvent_4019;
-		case RepresentationEditPart.VISUAL_ID:
-			return InformationItemRepresented_4020;
-		case InformationFlowEditPart.VISUAL_ID:
-			return InformationFlow_4021;
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static final DiagramElementTypes TYPED_INSTANCE = new DiagramElementTypes(elementTypeImages) {
-		/**
-		 * @generated
-		 */
-		@Override
-		public boolean isKnownElementType(IElementType elementType) {
-			return org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes.isKnownElementType(elementType);
-		}
-
-		/**
-		 * @generated
-		 */
-		@Override
-		public IElementType getElementTypeForVisualId(int visualID) {
-			return org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes.getElementType(visualID);
-		}
-
-		/**
-		 * @generated
-		 */
-		@Override
-		public ENamedElement getDefiningNamedElement(IAdaptable elementTypeAdapter) {
-			return org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes.getElement(elementTypeAdapter);
-		}
-	};
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.providers;

+

+import java.util.HashSet;

+import java.util.IdentityHashMap;

+import java.util.Map;

+import java.util.Set;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.ENamedElement;

+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.tooling.runtime.providers.DiagramElementTypeImages;

+import org.eclipse.gmf.tooling.runtime.providers.DiagramElementTypes;

+import org.eclipse.jface.resource.ImageDescriptor;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.*;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class UMLElementTypes {

+

+	/**

+	 * @generated

+	 */

+	private UMLElementTypes() {

+	}

+

+	/**

+	 * @generated

+	 */

+	private static Map<IElementType, ENamedElement> elements;

+

+	/**

+	 * @generated

+	 */

+	private static DiagramElementTypeImages elementTypeImages = new DiagramElementTypeImages(UMLDiagramEditorPlugin.getInstance().getItemProvidersAdapterFactory());

+

+	/**

+	 * @generated

+	 */

+	private static Set<IElementType> KNOWN_ELEMENT_TYPES;

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Package_1000 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Package_1000"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Activity_2060 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Activity_2060"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Interaction_2061 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Interaction_2061"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType ProtocolStateMachine_2062 = getElementType("org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_2062"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType StateMachine_2063 = getElementType("org.eclipse.papyrus.uml.diagram.composite.StateMachine_2063"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType FunctionBehavior_2064 = getElementType("org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_2064"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType OpaqueBehavior_2065 = getElementType("org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_2065"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Component_2069 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Component_2069"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Device_2070 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Device_2070"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType ExecutionEnvironment_2071 = getElementType("org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_2071"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Node_2072 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Node_2072"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Class_2073 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Class_2073"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Collaboration_2075 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Collaboration_2075"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Interface_2076 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Interface_2076"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType PrimitiveType_2066 = getElementType("org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_2066"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Enumeration_2067 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Enumeration_2067"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType DataType_2068 = getElementType("org.eclipse.papyrus.uml.diagram.composite.DataType_2068"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Actor_2077 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Actor_2077"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType DeploymentSpecification_2078 = getElementType("org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_2078"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Artifact_2079 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Artifact_2079"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType InformationItem_2080 = getElementType("org.eclipse.papyrus.uml.diagram.composite.InformationItem_2080"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Signal_2081 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Signal_2081"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType UseCase_2082 = getElementType("org.eclipse.papyrus.uml.diagram.composite.UseCase_2082"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType SignalEvent_2083 = getElementType("org.eclipse.papyrus.uml.diagram.composite.SignalEvent_2083"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType CallEvent_2084 = getElementType("org.eclipse.papyrus.uml.diagram.composite.CallEvent_2084"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType AnyReceiveEvent_2085 = getElementType("org.eclipse.papyrus.uml.diagram.composite.AnyReceiveEvent_2085"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType ChangeEvent_2088 = getElementType("org.eclipse.papyrus.uml.diagram.composite.ChangeEvent_2088"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType TimeEvent_2089 = getElementType("org.eclipse.papyrus.uml.diagram.composite.TimeEvent_2089"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType DurationObservation_2093 = getElementType("org.eclipse.papyrus.uml.diagram.composite.DurationObservation_2093"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType TimeObservation_2094 = getElementType("org.eclipse.papyrus.uml.diagram.composite.TimeObservation_2094"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType LiteralBoolean_2095 = getElementType("org.eclipse.papyrus.uml.diagram.composite.LiteralBoolean_2095"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType LiteralInteger_2096 = getElementType("org.eclipse.papyrus.uml.diagram.composite.LiteralInteger_2096"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType LiteralNull_2097 = getElementType("org.eclipse.papyrus.uml.diagram.composite.LiteralNull_2097"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType LiteralString_2098 = getElementType("org.eclipse.papyrus.uml.diagram.composite.LiteralString_2098"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType LiteralUnlimitedNatural_2099 = getElementType("org.eclipse.papyrus.uml.diagram.composite.LiteralUnlimitedNatural_2099"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType StringExpression_2100 = getElementType("org.eclipse.papyrus.uml.diagram.composite.StringExpression_2100"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType OpaqueExpression_2101 = getElementType("org.eclipse.papyrus.uml.diagram.composite.OpaqueExpression_2101"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType TimeExpression_2102 = getElementType("org.eclipse.papyrus.uml.diagram.composite.TimeExpression_2102"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Expression_2103 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Expression_2103"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Duration_2104 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Duration_2104"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType TimeInterval_2105 = getElementType("org.eclipse.papyrus.uml.diagram.composite.TimeInterval_2105"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType DurationInterval_2106 = getElementType("org.eclipse.papyrus.uml.diagram.composite.DurationInterval_2106"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Interval_2107 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Interval_2107"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType InstanceValue_2108 = getElementType("org.eclipse.papyrus.uml.diagram.composite.InstanceValue_2108"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Comment_2109 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Comment_2109"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType DurationConstraint_2110 = getElementType("org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_2110"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType TimeConstraint_2111 = getElementType("org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_2111"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType IntervalConstraint_2112 = getElementType("org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_2112"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType InteractionConstraint_2113 = getElementType("org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_2113"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Constraint_2114 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Constraint_2114"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Node_3121 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Node_3121"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Port_3069 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Port_3069"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Parameter_3088 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Parameter_3088"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Property_3070 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Property_3070"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType ConnectableElement_3115 = getElementType("org.eclipse.papyrus.uml.diagram.composite.prototype.CollaborationRole_3115"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType CollaborationUse_3071 = getElementType("org.eclipse.papyrus.uml.diagram.composite.CollaborationUse_3071"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Activity_3072 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Activity_3072"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Interaction_3073 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Interaction_3073"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType ProtocolStateMachine_3074 = getElementType("org.eclipse.papyrus.uml.diagram.composite.ProtocolStateMachine_3074"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType StateMachine_3075 = getElementType("org.eclipse.papyrus.uml.diagram.composite.StateMachine_3075"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType FunctionBehavior_3076 = getElementType("org.eclipse.papyrus.uml.diagram.composite.FunctionBehavior_3076"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType OpaqueBehavior_3077 = getElementType("org.eclipse.papyrus.uml.diagram.composite.OpaqueBehavior_3077"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Component_3081 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Component_3081"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Device_3082 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Device_3082"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType ExecutionEnvironment_3083 = getElementType("org.eclipse.papyrus.uml.diagram.composite.ExecutionEnvironment_3083"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Node_3084 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Node_3084"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Class_3085 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Class_3085"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Collaboration_3086 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Collaboration_3086"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Interface_3087 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Interface_3087"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType PrimitiveType_3078 = getElementType("org.eclipse.papyrus.uml.diagram.composite.PrimitiveType_3078"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Enumeration_3079 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Enumeration_3079"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType DataType_3080 = getElementType("org.eclipse.papyrus.uml.diagram.composite.DataType_3080"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Actor_3091 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Actor_3091"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType DeploymentSpecification_3092 = getElementType("org.eclipse.papyrus.uml.diagram.composite.DeploymentSpecification_3092"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Artifact_3093 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Artifact_3093"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType InformationItem_3094 = getElementType("org.eclipse.papyrus.uml.diagram.composite.InformationItem_3094"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Signal_3095 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Signal_3095"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType UseCase_3096 = getElementType("org.eclipse.papyrus.uml.diagram.composite.UseCase_3096"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Comment_3097 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Comment_3097"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType DurationConstraint_3116 = getElementType("org.eclipse.papyrus.uml.diagram.composite.DurationConstraint_3116"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType TimeConstraint_3117 = getElementType("org.eclipse.papyrus.uml.diagram.composite.TimeConstraint_3117"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType IntervalConstraint_3118 = getElementType("org.eclipse.papyrus.uml.diagram.composite.IntervalConstraint_3118"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType InteractionConstraint_3119 = getElementType("org.eclipse.papyrus.uml.diagram.composite.InteractionConstraint_3119"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Constraint_3120 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Constraint_3120"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Property_3101 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Property_3101"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Operation_3102 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Operation_3102"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType EnumerationLiteral_3066 = getElementType("org.eclipse.papyrus.uml.diagram.composite.EnumerationLiteral_3066"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Link_4022 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Link_4022"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Link_4001 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Link_4001"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType CommentAnnotatedElement_4002 = getElementType("org.eclipse.papyrus.uml.diagram.composite.CommentAnnotatedElement_4002"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType ConstraintConstrainedElement_4003 = getElementType("org.eclipse.papyrus.uml.diagram.composite.ConstraintConstrainedElement_4003"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType ComponentRealization_4004 = getElementType("org.eclipse.papyrus.uml.diagram.composite.ComponentRealization_4004"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType InterfaceRealization_4005 = getElementType("org.eclipse.papyrus.uml.diagram.composite.InterfaceRealization_4005"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Substitution_4011 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Substitution_4011"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Realization_4006 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Realization_4006"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Manifestation_4012 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Manifestation_4012"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Abstraction_4007 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Usage_4008 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Usage_4008"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Deployment_4009 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Deployment_4009"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Dependency_4017 = getElementType("org.eclipse.papyrus.uml.diagram.composite.RoleBinding_4017"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Dependency_4010 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Dependency_4010"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Connector_4013 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Connector_4013"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType Generalization_4015 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Generalization_4015"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType TimeObservationEvent_4018 = getElementType("org.eclipse.papyrus.uml.diagram.composite.TimeObservationEvent_4018"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType DurationObservationEvent_4019 = getElementType("org.eclipse.papyrus.uml.diagram.composite.DurationObservationEvent_4019"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType InformationItemRepresented_4020 = getElementType("org.eclipse.papyrus.uml.diagram.composite.Representation_4020"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static final IElementType InformationFlow_4021 = getElementType("org.eclipse.papyrus.uml.diagram.composite.InformationFlow_4021"); //$NON-NLS-1$

+

+	/**

+	 * @generated

+	 */

+	public static ImageDescriptor getImageDescriptor(ENamedElement element) {

+		return elementTypeImages.getImageDescriptor(element);

+	}

+

+	/**

+	 * @generated

+	 */

+	public static Image getImage(ENamedElement element) {

+		return elementTypeImages.getImage(element);

+	}

+

+	/**

+	 * @generated

+	 */

+	public static ImageDescriptor getImageDescriptor(IAdaptable hint) {

+		return getImageDescriptor(getElement(hint));

+	}

+

+	/**

+	 * @generated

+	 */

+	public static Image getImage(IAdaptable hint) {

+		return getImage(getElement(hint));

+	}

+

+	/**

+	 * Returns 'type' of the ecore object associated with the hint.

+	 * 

+	 * @generated

+	 */

+	public static synchronized ENamedElement getElement(IAdaptable hint) {

+		Object type = hint.getAdapter(IElementType.class);

+		if(elements == null) {

+			elements = new IdentityHashMap<IElementType, ENamedElement>();

+

+			elements.put(Package_1000, UMLPackage.eINSTANCE.getPackage());

+

+

+			elements.put(Activity_2060, UMLPackage.eINSTANCE.getActivity());

+

+

+			elements.put(Interaction_2061, UMLPackage.eINSTANCE.getInteraction());

+

+

+			elements.put(ProtocolStateMachine_2062, UMLPackage.eINSTANCE.getProtocolStateMachine());

+

+

+			elements.put(StateMachine_2063, UMLPackage.eINSTANCE.getStateMachine());

+

+

+			elements.put(FunctionBehavior_2064, UMLPackage.eINSTANCE.getFunctionBehavior());

+

+

+			elements.put(OpaqueBehavior_2065, UMLPackage.eINSTANCE.getOpaqueBehavior());

+

+

+			elements.put(Component_2069, UMLPackage.eINSTANCE.getComponent());

+

+

+			elements.put(Device_2070, UMLPackage.eINSTANCE.getDevice());

+

+

+			elements.put(ExecutionEnvironment_2071, UMLPackage.eINSTANCE.getExecutionEnvironment());

+

+

+			elements.put(Node_2072, UMLPackage.eINSTANCE.getNode());

+

+

+			elements.put(Class_2073, UMLPackage.eINSTANCE.getClass_());

+

+

+			elements.put(Collaboration_2075, UMLPackage.eINSTANCE.getCollaboration());

+

+

+			elements.put(Interface_2076, UMLPackage.eINSTANCE.getInterface());

+

+

+			elements.put(PrimitiveType_2066, UMLPackage.eINSTANCE.getPrimitiveType());

+

+

+			elements.put(Enumeration_2067, UMLPackage.eINSTANCE.getEnumeration());

+

+

+			elements.put(DataType_2068, UMLPackage.eINSTANCE.getDataType());

+

+

+			elements.put(Actor_2077, UMLPackage.eINSTANCE.getActor());

+

+

+			elements.put(DeploymentSpecification_2078, UMLPackage.eINSTANCE.getDeploymentSpecification());

+

+

+			elements.put(Artifact_2079, UMLPackage.eINSTANCE.getArtifact());

+

+

+			elements.put(InformationItem_2080, UMLPackage.eINSTANCE.getInformationItem());

+

+

+			elements.put(Signal_2081, UMLPackage.eINSTANCE.getSignal());

+

+

+			elements.put(UseCase_2082, UMLPackage.eINSTANCE.getUseCase());

+

+

+			elements.put(SignalEvent_2083, UMLPackage.eINSTANCE.getSignalEvent());

+

+

+			elements.put(CallEvent_2084, UMLPackage.eINSTANCE.getCallEvent());

+

+

+			elements.put(AnyReceiveEvent_2085, UMLPackage.eINSTANCE.getAnyReceiveEvent());

+

+

+			elements.put(ChangeEvent_2088, UMLPackage.eINSTANCE.getChangeEvent());

+

+

+			elements.put(TimeEvent_2089, UMLPackage.eINSTANCE.getTimeEvent());

+

+

+			elements.put(DurationObservation_2093, UMLPackage.eINSTANCE.getDurationObservation());

+

+

+			elements.put(TimeObservation_2094, UMLPackage.eINSTANCE.getTimeObservation());

+

+

+			elements.put(LiteralBoolean_2095, UMLPackage.eINSTANCE.getLiteralBoolean());

+

+

+			elements.put(LiteralInteger_2096, UMLPackage.eINSTANCE.getLiteralInteger());

+

+

+			elements.put(LiteralNull_2097, UMLPackage.eINSTANCE.getLiteralNull());

+

+

+			elements.put(LiteralString_2098, UMLPackage.eINSTANCE.getLiteralString());

+

+

+			elements.put(LiteralUnlimitedNatural_2099, UMLPackage.eINSTANCE.getLiteralUnlimitedNatural());

+

+

+			elements.put(StringExpression_2100, UMLPackage.eINSTANCE.getStringExpression());

+

+

+			elements.put(OpaqueExpression_2101, UMLPackage.eINSTANCE.getOpaqueExpression());

+

+

+			elements.put(TimeExpression_2102, UMLPackage.eINSTANCE.getTimeExpression());

+

+

+			elements.put(Expression_2103, UMLPackage.eINSTANCE.getExpression());

+

+

+			elements.put(Duration_2104, UMLPackage.eINSTANCE.getDuration());

+

+

+			elements.put(TimeInterval_2105, UMLPackage.eINSTANCE.getTimeInterval());

+

+

+			elements.put(DurationInterval_2106, UMLPackage.eINSTANCE.getDurationInterval());

+

+

+			elements.put(Interval_2107, UMLPackage.eINSTANCE.getInterval());

+

+

+			elements.put(InstanceValue_2108, UMLPackage.eINSTANCE.getInstanceValue());

+

+

+			elements.put(Comment_2109, UMLPackage.eINSTANCE.getComment());

+

+

+			elements.put(DurationConstraint_2110, UMLPackage.eINSTANCE.getDurationConstraint());

+

+

+			elements.put(TimeConstraint_2111, UMLPackage.eINSTANCE.getTimeConstraint());

+

+

+			elements.put(IntervalConstraint_2112, UMLPackage.eINSTANCE.getIntervalConstraint());

+

+

+			elements.put(InteractionConstraint_2113, UMLPackage.eINSTANCE.getInteractionConstraint());

+

+

+			elements.put(Constraint_2114, UMLPackage.eINSTANCE.getConstraint());

+

+

+			elements.put(Port_3069, UMLPackage.eINSTANCE.getPort());

+

+

+			elements.put(Parameter_3088, UMLPackage.eINSTANCE.getParameter());

+

+

+			elements.put(Property_3070, UMLPackage.eINSTANCE.getProperty());

+

+

+			elements.put(ConnectableElement_3115, UMLPackage.eINSTANCE.getConnectableElement());

+

+

+			elements.put(CollaborationUse_3071, UMLPackage.eINSTANCE.getCollaborationUse());

+

+

+			elements.put(Activity_3072, UMLPackage.eINSTANCE.getActivity());

+

+

+			elements.put(Interaction_3073, UMLPackage.eINSTANCE.getInteraction());

+

+

+			elements.put(ProtocolStateMachine_3074, UMLPackage.eINSTANCE.getProtocolStateMachine());

+

+

+			elements.put(StateMachine_3075, UMLPackage.eINSTANCE.getStateMachine());

+

+

+			elements.put(FunctionBehavior_3076, UMLPackage.eINSTANCE.getFunctionBehavior());

+

+

+			elements.put(OpaqueBehavior_3077, UMLPackage.eINSTANCE.getOpaqueBehavior());

+

+

+			elements.put(Component_3081, UMLPackage.eINSTANCE.getComponent());

+

+

+			elements.put(Device_3082, UMLPackage.eINSTANCE.getDevice());

+

+

+			elements.put(ExecutionEnvironment_3083, UMLPackage.eINSTANCE.getExecutionEnvironment());

+

+

+			elements.put(Node_3084, UMLPackage.eINSTANCE.getNode());

+

+

+			elements.put(Class_3085, UMLPackage.eINSTANCE.getClass_());

+

+

+			elements.put(Collaboration_3086, UMLPackage.eINSTANCE.getCollaboration());

+

+

+			elements.put(Interface_3087, UMLPackage.eINSTANCE.getInterface());

+

+

+			elements.put(PrimitiveType_3078, UMLPackage.eINSTANCE.getPrimitiveType());

+

+

+			elements.put(Enumeration_3079, UMLPackage.eINSTANCE.getEnumeration());

+

+

+			elements.put(DataType_3080, UMLPackage.eINSTANCE.getDataType());

+

+

+			elements.put(Actor_3091, UMLPackage.eINSTANCE.getActor());

+

+

+			elements.put(DeploymentSpecification_3092, UMLPackage.eINSTANCE.getDeploymentSpecification());

+

+

+			elements.put(Artifact_3093, UMLPackage.eINSTANCE.getArtifact());

+

+

+			elements.put(InformationItem_3094, UMLPackage.eINSTANCE.getInformationItem());

+

+

+			elements.put(Signal_3095, UMLPackage.eINSTANCE.getSignal());

+

+

+			elements.put(UseCase_3096, UMLPackage.eINSTANCE.getUseCase());

+

+

+			elements.put(Comment_3097, UMLPackage.eINSTANCE.getComment());

+

+

+			elements.put(DurationConstraint_3116, UMLPackage.eINSTANCE.getDurationConstraint());

+

+

+			elements.put(TimeConstraint_3117, UMLPackage.eINSTANCE.getTimeConstraint());

+

+

+			elements.put(IntervalConstraint_3118, UMLPackage.eINSTANCE.getIntervalConstraint());

+

+

+			elements.put(InteractionConstraint_3119, UMLPackage.eINSTANCE.getInteractionConstraint());

+

+

+			elements.put(Constraint_3120, UMLPackage.eINSTANCE.getConstraint());

+

+

+			elements.put(Property_3101, UMLPackage.eINSTANCE.getProperty());

+

+

+			elements.put(Operation_3102, UMLPackage.eINSTANCE.getOperation());

+

+

+			elements.put(EnumerationLiteral_3066, UMLPackage.eINSTANCE.getEnumerationLiteral());

+

+			elements.put(CommentAnnotatedElement_4002, UMLPackage.eINSTANCE.getComment_AnnotatedElement());

+

+			elements.put(ConstraintConstrainedElement_4003, UMLPackage.eINSTANCE.getConstraint_ConstrainedElement());

+

+

+			elements.put(ComponentRealization_4004, UMLPackage.eINSTANCE.getComponentRealization());

+

+

+			elements.put(InterfaceRealization_4005, UMLPackage.eINSTANCE.getInterfaceRealization());

+

+

+			elements.put(Substitution_4011, UMLPackage.eINSTANCE.getSubstitution());

+

+

+			elements.put(Realization_4006, UMLPackage.eINSTANCE.getRealization());

+

+

+			elements.put(Manifestation_4012, UMLPackage.eINSTANCE.getManifestation());

+

+

+			elements.put(Abstraction_4007, UMLPackage.eINSTANCE.getAbstraction());

+

+

+			elements.put(Usage_4008, UMLPackage.eINSTANCE.getUsage());

+

+

+			elements.put(Deployment_4009, UMLPackage.eINSTANCE.getDeployment());

+

+

+			elements.put(Dependency_4017, UMLPackage.eINSTANCE.getDependency());

+

+

+			elements.put(Dependency_4010, UMLPackage.eINSTANCE.getDependency());

+

+

+			elements.put(Connector_4013, UMLPackage.eINSTANCE.getConnector());

+

+

+			elements.put(Generalization_4015, UMLPackage.eINSTANCE.getGeneralization());

+

+			elements.put(TimeObservationEvent_4018, UMLPackage.eINSTANCE.getTimeObservation_Event());

+

+			elements.put(DurationObservationEvent_4019, UMLPackage.eINSTANCE.getDurationObservation_Event());

+

+			elements.put(InformationItemRepresented_4020, UMLPackage.eINSTANCE.getInformationItem_Represented());

+

+

+			elements.put(InformationFlow_4021, UMLPackage.eINSTANCE.getInformationFlow());

+		}

+		return (ENamedElement)elements.get(type);

+	}

+

+	/**

+	 * @generated

+	 */

+	private static IElementType getElementType(String id) {

+		return ElementTypeRegistry.getInstance().getType(id);

+	}

+

+	/**

+	 * @generated

+	 */

+	public static synchronized boolean isKnownElementType(IElementType elementType) {

+		if(KNOWN_ELEMENT_TYPES == null) {

+			KNOWN_ELEMENT_TYPES = new HashSet<IElementType>();

+			KNOWN_ELEMENT_TYPES.add(Package_1000);

+			KNOWN_ELEMENT_TYPES.add(Activity_2060);

+			KNOWN_ELEMENT_TYPES.add(Interaction_2061);

+			KNOWN_ELEMENT_TYPES.add(ProtocolStateMachine_2062);

+			KNOWN_ELEMENT_TYPES.add(StateMachine_2063);

+			KNOWN_ELEMENT_TYPES.add(FunctionBehavior_2064);

+			KNOWN_ELEMENT_TYPES.add(OpaqueBehavior_2065);

+			KNOWN_ELEMENT_TYPES.add(Component_2069);

+			KNOWN_ELEMENT_TYPES.add(Device_2070);

+			KNOWN_ELEMENT_TYPES.add(ExecutionEnvironment_2071);

+			KNOWN_ELEMENT_TYPES.add(Node_2072);

+			KNOWN_ELEMENT_TYPES.add(Class_2073);

+			KNOWN_ELEMENT_TYPES.add(Collaboration_2075);

+			KNOWN_ELEMENT_TYPES.add(Interface_2076);

+			KNOWN_ELEMENT_TYPES.add(PrimitiveType_2066);

+			KNOWN_ELEMENT_TYPES.add(Enumeration_2067);

+			KNOWN_ELEMENT_TYPES.add(DataType_2068);

+			KNOWN_ELEMENT_TYPES.add(Actor_2077);

+			KNOWN_ELEMENT_TYPES.add(DeploymentSpecification_2078);

+			KNOWN_ELEMENT_TYPES.add(Artifact_2079);

+			KNOWN_ELEMENT_TYPES.add(InformationItem_2080);

+			KNOWN_ELEMENT_TYPES.add(Signal_2081);

+			KNOWN_ELEMENT_TYPES.add(UseCase_2082);

+			KNOWN_ELEMENT_TYPES.add(SignalEvent_2083);

+			KNOWN_ELEMENT_TYPES.add(CallEvent_2084);

+			KNOWN_ELEMENT_TYPES.add(AnyReceiveEvent_2085);

+			KNOWN_ELEMENT_TYPES.add(ChangeEvent_2088);

+			KNOWN_ELEMENT_TYPES.add(TimeEvent_2089);

+			KNOWN_ELEMENT_TYPES.add(DurationObservation_2093);

+			KNOWN_ELEMENT_TYPES.add(TimeObservation_2094);

+			KNOWN_ELEMENT_TYPES.add(LiteralBoolean_2095);

+			KNOWN_ELEMENT_TYPES.add(LiteralInteger_2096);

+			KNOWN_ELEMENT_TYPES.add(LiteralNull_2097);

+			KNOWN_ELEMENT_TYPES.add(LiteralString_2098);

+			KNOWN_ELEMENT_TYPES.add(LiteralUnlimitedNatural_2099);

+			KNOWN_ELEMENT_TYPES.add(StringExpression_2100);

+			KNOWN_ELEMENT_TYPES.add(OpaqueExpression_2101);

+			KNOWN_ELEMENT_TYPES.add(TimeExpression_2102);

+			KNOWN_ELEMENT_TYPES.add(Expression_2103);

+			KNOWN_ELEMENT_TYPES.add(Duration_2104);

+			KNOWN_ELEMENT_TYPES.add(TimeInterval_2105);

+			KNOWN_ELEMENT_TYPES.add(DurationInterval_2106);

+			KNOWN_ELEMENT_TYPES.add(Interval_2107);

+			KNOWN_ELEMENT_TYPES.add(InstanceValue_2108);

+			KNOWN_ELEMENT_TYPES.add(Comment_2109);

+			KNOWN_ELEMENT_TYPES.add(DurationConstraint_2110);

+			KNOWN_ELEMENT_TYPES.add(TimeConstraint_2111);

+			KNOWN_ELEMENT_TYPES.add(IntervalConstraint_2112);

+			KNOWN_ELEMENT_TYPES.add(InteractionConstraint_2113);

+			KNOWN_ELEMENT_TYPES.add(Constraint_2114);

+			KNOWN_ELEMENT_TYPES.add(Node_3121);

+			KNOWN_ELEMENT_TYPES.add(Port_3069);

+			KNOWN_ELEMENT_TYPES.add(Parameter_3088);

+			KNOWN_ELEMENT_TYPES.add(Property_3070);

+			KNOWN_ELEMENT_TYPES.add(ConnectableElement_3115);

+			KNOWN_ELEMENT_TYPES.add(CollaborationUse_3071);

+			KNOWN_ELEMENT_TYPES.add(Activity_3072);

+			KNOWN_ELEMENT_TYPES.add(Interaction_3073);

+			KNOWN_ELEMENT_TYPES.add(ProtocolStateMachine_3074);

+			KNOWN_ELEMENT_TYPES.add(StateMachine_3075);

+			KNOWN_ELEMENT_TYPES.add(FunctionBehavior_3076);

+			KNOWN_ELEMENT_TYPES.add(OpaqueBehavior_3077);

+			KNOWN_ELEMENT_TYPES.add(Component_3081);

+			KNOWN_ELEMENT_TYPES.add(Device_3082);

+			KNOWN_ELEMENT_TYPES.add(ExecutionEnvironment_3083);

+			KNOWN_ELEMENT_TYPES.add(Node_3084);

+			KNOWN_ELEMENT_TYPES.add(Class_3085);

+			KNOWN_ELEMENT_TYPES.add(Collaboration_3086);

+			KNOWN_ELEMENT_TYPES.add(Interface_3087);

+			KNOWN_ELEMENT_TYPES.add(PrimitiveType_3078);

+			KNOWN_ELEMENT_TYPES.add(Enumeration_3079);

+			KNOWN_ELEMENT_TYPES.add(DataType_3080);

+			KNOWN_ELEMENT_TYPES.add(Actor_3091);

+			KNOWN_ELEMENT_TYPES.add(DeploymentSpecification_3092);

+			KNOWN_ELEMENT_TYPES.add(Artifact_3093);

+			KNOWN_ELEMENT_TYPES.add(InformationItem_3094);

+			KNOWN_ELEMENT_TYPES.add(Signal_3095);

+			KNOWN_ELEMENT_TYPES.add(UseCase_3096);

+			KNOWN_ELEMENT_TYPES.add(Comment_3097);

+			KNOWN_ELEMENT_TYPES.add(DurationConstraint_3116);

+			KNOWN_ELEMENT_TYPES.add(TimeConstraint_3117);

+			KNOWN_ELEMENT_TYPES.add(IntervalConstraint_3118);

+			KNOWN_ELEMENT_TYPES.add(InteractionConstraint_3119);

+			KNOWN_ELEMENT_TYPES.add(Constraint_3120);

+			KNOWN_ELEMENT_TYPES.add(Property_3101);

+			KNOWN_ELEMENT_TYPES.add(Operation_3102);

+			KNOWN_ELEMENT_TYPES.add(EnumerationLiteral_3066);

+			KNOWN_ELEMENT_TYPES.add(Link_4022);

+			KNOWN_ELEMENT_TYPES.add(Link_4001);

+			KNOWN_ELEMENT_TYPES.add(CommentAnnotatedElement_4002);

+			KNOWN_ELEMENT_TYPES.add(ConstraintConstrainedElement_4003);

+			KNOWN_ELEMENT_TYPES.add(ComponentRealization_4004);

+			KNOWN_ELEMENT_TYPES.add(InterfaceRealization_4005);

+			KNOWN_ELEMENT_TYPES.add(Substitution_4011);

+			KNOWN_ELEMENT_TYPES.add(Realization_4006);

+			KNOWN_ELEMENT_TYPES.add(Manifestation_4012);

+			KNOWN_ELEMENT_TYPES.add(Abstraction_4007);

+			KNOWN_ELEMENT_TYPES.add(Usage_4008);

+			KNOWN_ELEMENT_TYPES.add(Deployment_4009);

+			KNOWN_ELEMENT_TYPES.add(Dependency_4017);

+			KNOWN_ELEMENT_TYPES.add(Dependency_4010);

+			KNOWN_ELEMENT_TYPES.add(Connector_4013);

+			KNOWN_ELEMENT_TYPES.add(Generalization_4015);

+			KNOWN_ELEMENT_TYPES.add(TimeObservationEvent_4018);

+			KNOWN_ELEMENT_TYPES.add(DurationObservationEvent_4019);

+			KNOWN_ELEMENT_TYPES.add(InformationItemRepresented_4020);

+			KNOWN_ELEMENT_TYPES.add(InformationFlow_4021);

+		}

+		return KNOWN_ELEMENT_TYPES.contains(elementType);

+	}

+

+	/**

+	 * @generated

+	 */

+	public static IElementType getElementType(int visualID) {

+		switch(visualID) {

+		case CompositeStructureDiagramEditPart.VISUAL_ID:

+			return Package_1000;

+		case ActivityCompositeEditPart.VISUAL_ID:

+			return Activity_2060;

+		case InteractionCompositeEditPart.VISUAL_ID:

+			return Interaction_2061;

+		case ProtocolStateMachineCompositeEditPart.VISUAL_ID:

+			return ProtocolStateMachine_2062;

+		case StateMachineCompositeEditPart.VISUAL_ID:

+			return StateMachine_2063;

+		case FunctionBehaviorCompositeEditPart.VISUAL_ID:

+			return FunctionBehavior_2064;

+		case OpaqueBehaviorCompositeEditPart.VISUAL_ID:

+			return OpaqueBehavior_2065;

+		case ComponentCompositeEditPart.VISUAL_ID:

+			return Component_2069;

+		case DeviceCompositeEditPart.VISUAL_ID:

+			return Device_2070;

+		case ExecutionEnvironmentCompositeEditPart.VISUAL_ID:

+			return ExecutionEnvironment_2071;

+		case NodeCompositeEditPart.VISUAL_ID:

+			return Node_2072;

+		case ClassCompositeEditPart.VISUAL_ID:

+			return Class_2073;

+		case CollaborationCompositeEditPart.VISUAL_ID:

+			return Collaboration_2075;

+		case InterfaceEditPart.VISUAL_ID:

+			return Interface_2076;

+		case PrimitiveTypeEditPart.VISUAL_ID:

+			return PrimitiveType_2066;

+		case EnumerationEditPart.VISUAL_ID:

+			return Enumeration_2067;

+		case DataTypeEditPart.VISUAL_ID:

+			return DataType_2068;

+		case ActorEditPart.VISUAL_ID:

+			return Actor_2077;

+		case DeploymentSpecificationEditPart.VISUAL_ID:

+			return DeploymentSpecification_2078;

+		case ArtifactEditPart.VISUAL_ID:

+			return Artifact_2079;

+		case InformationItemEditPart.VISUAL_ID:

+			return InformationItem_2080;

+		case SignalEditPart.VISUAL_ID:

+			return Signal_2081;

+		case UseCaseEditPart.VISUAL_ID:

+			return UseCase_2082;

+		case SignalEventEditPart.VISUAL_ID:

+			return SignalEvent_2083;

+		case CallEventEditPart.VISUAL_ID:

+			return CallEvent_2084;

+		case AnyReceiveEventEditPart.VISUAL_ID:

+			return AnyReceiveEvent_2085;

+		case ChangeEventEditPart.VISUAL_ID:

+			return ChangeEvent_2088;

+		case TimeEventEditPart.VISUAL_ID:

+			return TimeEvent_2089;

+		case DurationObservationEditPart.VISUAL_ID:

+			return DurationObservation_2093;

+		case TimeObservationEditPart.VISUAL_ID:

+			return TimeObservation_2094;

+		case LiteralBooleanEditPart.VISUAL_ID:

+			return LiteralBoolean_2095;

+		case LiteralIntegerEditPart.VISUAL_ID:

+			return LiteralInteger_2096;

+		case LiteralNullEditPart.VISUAL_ID:

+			return LiteralNull_2097;

+		case LiteralStringEditPart.VISUAL_ID:

+			return LiteralString_2098;

+		case LiteralUnlimitedNaturalEditPart.VISUAL_ID:

+			return LiteralUnlimitedNatural_2099;

+		case StringExpressionEditPart.VISUAL_ID:

+			return StringExpression_2100;

+		case OpaqueExpressionEditPart.VISUAL_ID:

+			return OpaqueExpression_2101;

+		case TimeExpressionEditPart.VISUAL_ID:

+			return TimeExpression_2102;

+		case ExpressionEditPart.VISUAL_ID:

+			return Expression_2103;

+		case DurationEditPart.VISUAL_ID:

+			return Duration_2104;

+		case TimeIntervalEditPart.VISUAL_ID:

+			return TimeInterval_2105;

+		case DurationIntervalEditPart.VISUAL_ID:

+			return DurationInterval_2106;

+		case IntervalEditPart.VISUAL_ID:

+			return Interval_2107;

+		case InstanceValueEditPart.VISUAL_ID:

+			return InstanceValue_2108;

+		case CommentEditPart.VISUAL_ID:

+			return Comment_2109;

+		case DurationConstraintEditPart.VISUAL_ID:

+			return DurationConstraint_2110;

+		case TimeConstraintEditPart.VISUAL_ID:

+			return TimeConstraint_2111;

+		case IntervalConstraintEditPart.VISUAL_ID:

+			return IntervalConstraint_2112;

+		case InteractionConstraintEditPart.VISUAL_ID:

+			return InteractionConstraint_2113;

+		case ConstraintEditPart.VISUAL_ID:

+			return Constraint_2114;

+		case BehaviorPortEditPart.VISUAL_ID:

+			return Node_3121;

+		case PortEditPart.VISUAL_ID:

+			return Port_3069;

+		case ParameterEditPart.VISUAL_ID:

+			return Parameter_3088;

+		case PropertyPartEditPartCN.VISUAL_ID:

+			return Property_3070;

+		case CollaborationRoleEditPartCN.VISUAL_ID:

+			return ConnectableElement_3115;

+		case CollaborationUseEditPartCN.VISUAL_ID:

+			return CollaborationUse_3071;

+		case ActivityCompositeEditPartCN.VISUAL_ID:

+			return Activity_3072;

+		case InteractionCompositeEditPartCN.VISUAL_ID:

+			return Interaction_3073;

+		case ProtocolStateMachineCompositeEditPartCN.VISUAL_ID:

+			return ProtocolStateMachine_3074;

+		case StateMachineCompositeEditPartCN.VISUAL_ID:

+			return StateMachine_3075;

+		case FunctionBehaviorCompositeEditPartCN.VISUAL_ID:

+			return FunctionBehavior_3076;

+		case OpaqueBehaviorCompositeEditPartCN.VISUAL_ID:

+			return OpaqueBehavior_3077;

+		case ComponentCompositeEditPartCN.VISUAL_ID:

+			return Component_3081;

+		case DeviceCompositeEditPartCN.VISUAL_ID:

+			return Device_3082;

+		case ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID:

+			return ExecutionEnvironment_3083;

+		case NodeCompositeEditPartCN.VISUAL_ID:

+			return Node_3084;

+		case ClassCompositeEditPartCN.VISUAL_ID:

+			return Class_3085;

+		case CollaborationCompositeEditPartCN.VISUAL_ID:

+			return Collaboration_3086;

+		case InterfaceEditPartCN.VISUAL_ID:

+			return Interface_3087;

+		case PrimitiveTypeEditPartCN.VISUAL_ID:

+			return PrimitiveType_3078;

+		case EnumerationEditPartCN.VISUAL_ID:

+			return Enumeration_3079;

+		case DataTypeEditPartCN.VISUAL_ID:

+			return DataType_3080;

+		case ActorEditPartCN.VISUAL_ID:

+			return Actor_3091;

+		case DeploymentSpecificationEditPartCN.VISUAL_ID:

+			return DeploymentSpecification_3092;

+		case ArtifactEditPartCN.VISUAL_ID:

+			return Artifact_3093;

+		case InformationItemEditPartCN.VISUAL_ID:

+			return InformationItem_3094;

+		case SignalEditPartCN.VISUAL_ID:

+			return Signal_3095;

+		case UseCaseEditPartCN.VISUAL_ID:

+			return UseCase_3096;

+		case CommentEditPartCN.VISUAL_ID:

+			return Comment_3097;

+		case DurationConstraintEditPartCN.VISUAL_ID:

+			return DurationConstraint_3116;

+		case TimeConstraintEditPartCN.VISUAL_ID:

+			return TimeConstraint_3117;

+		case IntervalConstraintEditPartCN.VISUAL_ID:

+			return IntervalConstraint_3118;

+		case InteractionConstraintEditPartCN.VISUAL_ID:

+			return InteractionConstraint_3119;

+		case ConstraintEditPartCN.VISUAL_ID:

+			return Constraint_3120;

+		case PropertyEditPartCLN.VISUAL_ID:

+			return Property_3101;

+		case OperationEditPartCLN.VISUAL_ID:

+			return Operation_3102;

+		case EnumerationLiteralEditPartCLN.VISUAL_ID:

+			return EnumerationLiteral_3066;

+		case BehaviorPortLinkEditPart.VISUAL_ID:

+			return Link_4022;

+		case LinkDescriptorEditPart.VISUAL_ID:

+			return Link_4001;

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return CommentAnnotatedElement_4002;

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return ConstraintConstrainedElement_4003;

+		case ComponentRealizationEditPart.VISUAL_ID:

+			return ComponentRealization_4004;

+		case InterfaceRealizationEditPart.VISUAL_ID:

+			return InterfaceRealization_4005;

+		case SubstitutionEditPart.VISUAL_ID:

+			return Substitution_4011;

+		case RealizationEditPart.VISUAL_ID:

+			return Realization_4006;

+		case ManifestationEditPart.VISUAL_ID:

+			return Manifestation_4012;

+		case AbstractionEditPart.VISUAL_ID:

+			return Abstraction_4007;

+		case UsageEditPart.VISUAL_ID:

+			return Usage_4008;

+		case DeploymentEditPart.VISUAL_ID:

+			return Deployment_4009;

+		case RoleBindingEditPart.VISUAL_ID:

+			return Dependency_4017;

+		case DependencyEditPart.VISUAL_ID:

+			return Dependency_4010;

+		case ConnectorEditPart.VISUAL_ID:

+			return Connector_4013;

+		case GeneralizationEditPart.VISUAL_ID:

+			return Generalization_4015;

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return TimeObservationEvent_4018;

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return DurationObservationEvent_4019;

+		case RepresentationEditPart.VISUAL_ID:

+			return InformationItemRepresented_4020;

+		case InformationFlowEditPart.VISUAL_ID:

+			return InformationFlow_4021;

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static final DiagramElementTypes TYPED_INSTANCE = new DiagramElementTypes(elementTypeImages) {

+

+		/**

+		 * @generated

+		 */

+		@Override

+		public boolean isKnownElementType(IElementType elementType) {

+			return org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes.isKnownElementType(elementType);

+		}

+

+		/**

+		 * @generated

+		 */

+		@Override

+		public IElementType getElementTypeForVisualId(int visualID) {

+			return org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes.getElementType(visualID);

+		}

+

+		/**

+		 * @generated

+		 */

+		@Override

+		public ENamedElement getDefiningNamedElement(IAdaptable elementTypeAdapter) {

+			return org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes.getElement(elementTypeAdapter);

+		}

+	};

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLIconProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLIconProvider.java
index 9e4509b3a39..f3a93eefb3a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLIconProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLIconProvider.java
@@ -1,27 +1,28 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.providers;
-
-import org.eclipse.gmf.runtime.common.ui.services.icon.IIconProvider;
-import org.eclipse.gmf.tooling.runtime.providers.DefaultElementTypeIconProvider;
-
-/**
- * @generated
- */
-public class UMLIconProvider extends DefaultElementTypeIconProvider implements IIconProvider {
-	/**
-	 * @generated
-	 */
-	public UMLIconProvider() {
-		super(UMLElementTypes.TYPED_INSTANCE);
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.providers;

+

+import org.eclipse.gmf.runtime.common.ui.services.icon.IIconProvider;

+import org.eclipse.gmf.tooling.runtime.providers.DefaultElementTypeIconProvider;

+

+/**

+ * @generated

+ */

+public class UMLIconProvider extends DefaultElementTypeIconProvider implements IIconProvider {

+

+	/**

+	 * @generated

+	 */

+	public UMLIconProvider() {

+		super(UMLElementTypes.TYPED_INSTANCE);

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLMarkerNavigationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLMarkerNavigationProvider.java
index 80ad897fabe..347fd20290a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLMarkerNavigationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLMarkerNavigationProvider.java
@@ -1,97 +1,92 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.providers;
-
-import java.util.Arrays;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
-import org.eclipse.gmf.runtime.emf.ui.providers.marker.AbstractModelMarkerNavigationProvider;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorUtil;
-
-/**
- * @generated
- */
-public class UMLMarkerNavigationProvider
-		extends AbstractModelMarkerNavigationProvider {
-	/**
-	 * @generated
-	 */
-	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)) {
-			return;
-		}
-		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 }));
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void deleteMarkers(IResource resource) {
-		try {
-			resource.deleteMarkers(MARKER_TYPE, true, IResource.DEPTH_ZERO);
-		} catch (CoreException e) {
-			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) {
-		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);
-			int markerSeverity = IMarker.SEVERITY_INFO;
-			if (statusSeverity == IStatus.WARNING) {
-				markerSeverity = IMarker.SEVERITY_WARNING;
-			} 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$
-		}
-		return marker;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.providers;

+

+import java.util.Arrays;

+import java.util.Map;

+

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IMarker;

+import org.eclipse.core.resources.IResource;

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.IStatus;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;

+import org.eclipse.gmf.runtime.emf.ui.providers.marker.AbstractModelMarkerNavigationProvider;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorUtil;

+

+/**

+ * @generated

+ */

+public class UMLMarkerNavigationProvider extends AbstractModelMarkerNavigationProvider {

+

+	/**

+	 * @generated

+	 */

+	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)) {

+			return;

+		}

+		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 }));

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public static void deleteMarkers(IResource resource) {

+		try {

+			resource.deleteMarkers(MARKER_TYPE, true, IResource.DEPTH_ZERO);

+		} catch (CoreException e) {

+			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) {

+		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);

+			int markerSeverity = IMarker.SEVERITY_INFO;

+			if(statusSeverity == IStatus.WARNING) {

+				markerSeverity = IMarker.SEVERITY_WARNING;

+			} 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$

+		}

+		return marker;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLParserProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLParserProvider.java
index ace9cefcf5a..9dbc227afcc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLParserProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLParserProvider.java
@@ -1,2829 +1,2741 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.providers;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.common.ui.services.parser.GetParserOperation;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;
-import org.eclipse.gmf.runtime.common.ui.services.parser.IParserProvider;
-import org.eclipse.gmf.runtime.common.ui.services.parser.ParserService;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.parser.CommentParser;
-import org.eclipse.papyrus.uml.diagram.common.parser.ConstraintParser;
-import org.eclipse.papyrus.uml.diagram.common.parser.stereotype.AppliedStereotypeParser;
-import org.eclipse.papyrus.uml.diagram.composite.custom.parsers.RoleBindingRoleNameParser;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.*;
-import org.eclipse.papyrus.uml.diagram.composite.parsers.MessageFormatParser;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.uml2.uml.UMLPackage;
-
-/**
- * @generated
- */
-public class UMLParserProvider extends AbstractProvider implements IParserProvider {
-	/**
-	 * @generated
-	 */
-	private IParser activityName_5112Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getActivityName_5112Parser() {
-		if (activityName_5112Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			activityName_5112Parser = parser;
-		}
-		return activityName_5112Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser interactionName_5113Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getInteractionName_5113Parser() {
-		if (interactionName_5113Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			interactionName_5113Parser = parser;
-		}
-		return interactionName_5113Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser protocolStateMachineName_5114Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getProtocolStateMachineName_5114Parser() {
-		if (protocolStateMachineName_5114Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			protocolStateMachineName_5114Parser = parser;
-		}
-		return protocolStateMachineName_5114Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser stateMachineName_5115Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getStateMachineName_5115Parser() {
-		if (stateMachineName_5115Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			stateMachineName_5115Parser = parser;
-		}
-		return stateMachineName_5115Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser functionBehaviorName_5116Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getFunctionBehaviorName_5116Parser() {
-		if (functionBehaviorName_5116Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			functionBehaviorName_5116Parser = parser;
-		}
-		return functionBehaviorName_5116Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser opaqueBehaviorName_5117Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getOpaqueBehaviorName_5117Parser() {
-		if (opaqueBehaviorName_5117Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			opaqueBehaviorName_5117Parser = parser;
-		}
-		return opaqueBehaviorName_5117Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser componentName_5121Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getComponentName_5121Parser() {
-		if (componentName_5121Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			componentName_5121Parser = parser;
-		}
-		return componentName_5121Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser deviceName_5122Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getDeviceName_5122Parser() {
-		if (deviceName_5122Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			deviceName_5122Parser = parser;
-		}
-		return deviceName_5122Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser executionEnvironmentName_5123Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getExecutionEnvironmentName_5123Parser() {
-		if (executionEnvironmentName_5123Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			executionEnvironmentName_5123Parser = parser;
-		}
-		return executionEnvironmentName_5123Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser nodeName_5124Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getNodeName_5124Parser() {
-		if (nodeName_5124Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			nodeName_5124Parser = parser;
-		}
-		return nodeName_5124Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser className_5156Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getClassName_5156Parser() {
-		if (className_5156Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			className_5156Parser = parser;
-		}
-		return className_5156Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser collaborationName_5158Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getCollaborationName_5158Parser() {
-		if (collaborationName_5158Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			collaborationName_5158Parser = parser;
-		}
-		return collaborationName_5158Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser interfaceName_5159Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getInterfaceName_5159Parser() {
-		if (interfaceName_5159Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			interfaceName_5159Parser = parser;
-		}
-		return interfaceName_5159Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser primitiveTypeName_5118Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getPrimitiveTypeName_5118Parser() {
-		if (primitiveTypeName_5118Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			primitiveTypeName_5118Parser = parser;
-		}
-		return primitiveTypeName_5118Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser enumerationName_5119Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getEnumerationName_5119Parser() {
-		if (enumerationName_5119Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			enumerationName_5119Parser = parser;
-		}
-		return enumerationName_5119Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser dataTypeName_5120Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getDataTypeName_5120Parser() {
-		if (dataTypeName_5120Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			dataTypeName_5120Parser = parser;
-		}
-		return dataTypeName_5120Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser actorName_5160Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getActorName_5160Parser() {
-		if (actorName_5160Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			actorName_5160Parser = parser;
-		}
-		return actorName_5160Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser deploymentSpecificationName_5161Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getDeploymentSpecificationName_5161Parser() {
-		if (deploymentSpecificationName_5161Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			deploymentSpecificationName_5161Parser = parser;
-		}
-		return deploymentSpecificationName_5161Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser artifactName_5162Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getArtifactName_5162Parser() {
-		if (artifactName_5162Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			artifactName_5162Parser = parser;
-		}
-		return artifactName_5162Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser informationItemName_5163Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getInformationItemName_5163Parser() {
-		if (informationItemName_5163Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			informationItemName_5163Parser = parser;
-		}
-		return informationItemName_5163Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser signalName_5164Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getSignalName_5164Parser() {
-		if (signalName_5164Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			signalName_5164Parser = parser;
-		}
-		return signalName_5164Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser useCaseName_5165Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getUseCaseName_5165Parser() {
-		if (useCaseName_5165Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			useCaseName_5165Parser = parser;
-		}
-		return useCaseName_5165Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser signalEventName_5166Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getSignalEventName_5166Parser() {
-		if (signalEventName_5166Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			signalEventName_5166Parser = parser;
-		}
-		return signalEventName_5166Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser callEventName_5167Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getCallEventName_5167Parser() {
-		if (callEventName_5167Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			callEventName_5167Parser = parser;
-		}
-		return callEventName_5167Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser anyReceiveEventName_5168Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getAnyReceiveEventName_5168Parser() {
-		if (anyReceiveEventName_5168Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			anyReceiveEventName_5168Parser = parser;
-		}
-		return anyReceiveEventName_5168Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser changeEventName_5171Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getChangeEventName_5171Parser() {
-		if (changeEventName_5171Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			changeEventName_5171Parser = parser;
-		}
-		return changeEventName_5171Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser timeEventName_5172Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getTimeEventName_5172Parser() {
-		if (timeEventName_5172Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			timeEventName_5172Parser = parser;
-		}
-		return timeEventName_5172Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser durationObservationName_5151Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getDurationObservationName_5151Parser() {
-		if (durationObservationName_5151Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			durationObservationName_5151Parser = parser;
-		}
-		return durationObservationName_5151Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private AppliedStereotypeParser durationObservationName_5152Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getDurationObservationName_5152Parser() {
-		if (durationObservationName_5152Parser == null) {
-			durationObservationName_5152Parser = new AppliedStereotypeParser();
-		}
-		return durationObservationName_5152Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser timeObservationName_5142Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getTimeObservationName_5142Parser() {
-		if (timeObservationName_5142Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			timeObservationName_5142Parser = parser;
-		}
-		return timeObservationName_5142Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private AppliedStereotypeParser timeObservationName_5143Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getTimeObservationName_5143Parser() {
-		if (timeObservationName_5143Parser == null) {
-			timeObservationName_5143Parser = new AppliedStereotypeParser();
-		}
-		return timeObservationName_5143Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser literalBooleanName_5178Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getLiteralBooleanName_5178Parser() {
-		if (literalBooleanName_5178Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			literalBooleanName_5178Parser = parser;
-		}
-		return literalBooleanName_5178Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser literalIntegerName_5179Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getLiteralIntegerName_5179Parser() {
-		if (literalIntegerName_5179Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			literalIntegerName_5179Parser = parser;
-		}
-		return literalIntegerName_5179Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser literalNullName_5180Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getLiteralNullName_5180Parser() {
-		if (literalNullName_5180Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			literalNullName_5180Parser = parser;
-		}
-		return literalNullName_5180Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser literalStringName_5181Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getLiteralStringName_5181Parser() {
-		if (literalStringName_5181Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			literalStringName_5181Parser = parser;
-		}
-		return literalStringName_5181Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser literalUnlimitedNaturalName_5182Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getLiteralUnlimitedNaturalName_5182Parser() {
-		if (literalUnlimitedNaturalName_5182Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			literalUnlimitedNaturalName_5182Parser = parser;
-		}
-		return literalUnlimitedNaturalName_5182Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser stringExpressionName_5183Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getStringExpressionName_5183Parser() {
-		if (stringExpressionName_5183Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			stringExpressionName_5183Parser = parser;
-		}
-		return stringExpressionName_5183Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser opaqueExpressionName_5184Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getOpaqueExpressionName_5184Parser() {
-		if (opaqueExpressionName_5184Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			opaqueExpressionName_5184Parser = parser;
-		}
-		return opaqueExpressionName_5184Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser timeExpressionName_5185Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getTimeExpressionName_5185Parser() {
-		if (timeExpressionName_5185Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			timeExpressionName_5185Parser = parser;
-		}
-		return timeExpressionName_5185Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser expressionName_5186Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getExpressionName_5186Parser() {
-		if (expressionName_5186Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			expressionName_5186Parser = parser;
-		}
-		return expressionName_5186Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser durationName_5187Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getDurationName_5187Parser() {
-		if (durationName_5187Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			durationName_5187Parser = parser;
-		}
-		return durationName_5187Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser timeIntervalName_5188Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getTimeIntervalName_5188Parser() {
-		if (timeIntervalName_5188Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			timeIntervalName_5188Parser = parser;
-		}
-		return timeIntervalName_5188Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser durationIntervalName_5189Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getDurationIntervalName_5189Parser() {
-		if (durationIntervalName_5189Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			durationIntervalName_5189Parser = parser;
-		}
-		return durationIntervalName_5189Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser intervalName_5190Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getIntervalName_5190Parser() {
-		if (intervalName_5190Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			intervalName_5190Parser = parser;
-		}
-		return intervalName_5190Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser instanceValueName_5191Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getInstanceValueName_5191Parser() {
-		if (instanceValueName_5191Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			instanceValueName_5191Parser = parser;
-		}
-		return instanceValueName_5191Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private CommentParser commentBody_5192Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getCommentBody_5192Parser() {
-		if (commentBody_5192Parser == null) {
-			commentBody_5192Parser = new CommentParser();
-		}
-		return commentBody_5192Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser durationConstraintName_5193Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getDurationConstraintName_5193Parser() {
-		if (durationConstraintName_5193Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			durationConstraintName_5193Parser = parser;
-		}
-		return durationConstraintName_5193Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ConstraintParser durationConstraintSpecification_6035Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getDurationConstraintSpecification_6035Parser() {
-		if (durationConstraintSpecification_6035Parser == null) {
-			durationConstraintSpecification_6035Parser = new ConstraintParser();
-		}
-		return durationConstraintSpecification_6035Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser timeConstraintName_5194Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getTimeConstraintName_5194Parser() {
-		if (timeConstraintName_5194Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			timeConstraintName_5194Parser = parser;
-		}
-		return timeConstraintName_5194Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ConstraintParser timeConstraintSpecification_6036Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getTimeConstraintSpecification_6036Parser() {
-		if (timeConstraintSpecification_6036Parser == null) {
-			timeConstraintSpecification_6036Parser = new ConstraintParser();
-		}
-		return timeConstraintSpecification_6036Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser intervalConstraintName_5195Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getIntervalConstraintName_5195Parser() {
-		if (intervalConstraintName_5195Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			intervalConstraintName_5195Parser = parser;
-		}
-		return intervalConstraintName_5195Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ConstraintParser intervalConstraintSpecification_6037Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getIntervalConstraintSpecification_6037Parser() {
-		if (intervalConstraintSpecification_6037Parser == null) {
-			intervalConstraintSpecification_6037Parser = new ConstraintParser();
-		}
-		return intervalConstraintSpecification_6037Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser interactionConstraintName_5196Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getInteractionConstraintName_5196Parser() {
-		if (interactionConstraintName_5196Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			interactionConstraintName_5196Parser = parser;
-		}
-		return interactionConstraintName_5196Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ConstraintParser interactionConstraintSpecification_6038Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getInteractionConstraintSpecification_6038Parser() {
-		if (interactionConstraintSpecification_6038Parser == null) {
-			interactionConstraintSpecification_6038Parser = new ConstraintParser();
-		}
-		return interactionConstraintSpecification_6038Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser constraintName_5197Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getConstraintName_5197Parser() {
-		if (constraintName_5197Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			constraintName_5197Parser = parser;
-		}
-		return constraintName_5197Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ConstraintParser constraintSpecification_6039Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getConstraintSpecification_6039Parser() {
-		if (constraintSpecification_6039Parser == null) {
-			constraintSpecification_6039Parser = new ConstraintParser();
-		}
-		return constraintSpecification_6039Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser portName_5125Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getPortName_5125Parser() {
-		if (portName_5125Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			portName_5125Parser = parser;
-		}
-		return portName_5125Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private AppliedStereotypeParser portName_6029Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getPortName_6029Parser() {
-		if (portName_6029Parser == null) {
-			portName_6029Parser = new AppliedStereotypeParser();
-		}
-		return portName_6029Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser parameterName_6033Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getParameterName_6033Parser() {
-		if (parameterName_6033Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parameterName_6033Parser = parser;
-		}
-		return parameterName_6033Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private AppliedStereotypeParser parameterName_6034Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getParameterName_6034Parser() {
-		if (parameterName_6034Parser == null) {
-			parameterName_6034Parser = new AppliedStereotypeParser();
-		}
-		return parameterName_6034Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser propertyName_5126Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getPropertyName_5126Parser() {
-		if (propertyName_5126Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			propertyName_5126Parser = parser;
-		}
-		return propertyName_5126Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser connectableElementName_5198Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getConnectableElementName_5198Parser() {
-		if (connectableElementName_5198Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}"); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			connectableElementName_5198Parser = parser;
-		}
-		return connectableElementName_5198Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser collaborationUseName_5127Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getCollaborationUseName_5127Parser() {
-		if (collaborationUseName_5127Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			collaborationUseName_5127Parser = parser;
-		}
-		return collaborationUseName_5127Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser activityName_5128Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getActivityName_5128Parser() {
-		if (activityName_5128Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			activityName_5128Parser = parser;
-		}
-		return activityName_5128Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser interactionName_5129Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getInteractionName_5129Parser() {
-		if (interactionName_5129Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			interactionName_5129Parser = parser;
-		}
-		return interactionName_5129Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser protocolStateMachineName_5130Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getProtocolStateMachineName_5130Parser() {
-		if (protocolStateMachineName_5130Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			protocolStateMachineName_5130Parser = parser;
-		}
-		return protocolStateMachineName_5130Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser stateMachineName_5131Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getStateMachineName_5131Parser() {
-		if (stateMachineName_5131Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			stateMachineName_5131Parser = parser;
-		}
-		return stateMachineName_5131Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser functionBehaviorName_5132Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getFunctionBehaviorName_5132Parser() {
-		if (functionBehaviorName_5132Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			functionBehaviorName_5132Parser = parser;
-		}
-		return functionBehaviorName_5132Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser opaqueBehaviorName_5133Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getOpaqueBehaviorName_5133Parser() {
-		if (opaqueBehaviorName_5133Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			opaqueBehaviorName_5133Parser = parser;
-		}
-		return opaqueBehaviorName_5133Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser componentName_5137Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getComponentName_5137Parser() {
-		if (componentName_5137Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			componentName_5137Parser = parser;
-		}
-		return componentName_5137Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser deviceName_5138Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getDeviceName_5138Parser() {
-		if (deviceName_5138Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			deviceName_5138Parser = parser;
-		}
-		return deviceName_5138Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser executionEnvironmentName_5139Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getExecutionEnvironmentName_5139Parser() {
-		if (executionEnvironmentName_5139Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			executionEnvironmentName_5139Parser = parser;
-		}
-		return executionEnvironmentName_5139Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser nodeName_5140Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getNodeName_5140Parser() {
-		if (nodeName_5140Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			nodeName_5140Parser = parser;
-		}
-		return nodeName_5140Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser className_5155Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getClassName_5155Parser() {
-		if (className_5155Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			className_5155Parser = parser;
-		}
-		return className_5155Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser collaborationName_5141Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getCollaborationName_5141Parser() {
-		if (collaborationName_5141Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			collaborationName_5141Parser = parser;
-		}
-		return collaborationName_5141Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser interfaceName_5154Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getInterfaceName_5154Parser() {
-		if (interfaceName_5154Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			interfaceName_5154Parser = parser;
-		}
-		return interfaceName_5154Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser primitiveTypeName_5134Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getPrimitiveTypeName_5134Parser() {
-		if (primitiveTypeName_5134Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			primitiveTypeName_5134Parser = parser;
-		}
-		return primitiveTypeName_5134Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser enumerationName_5135Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getEnumerationName_5135Parser() {
-		if (enumerationName_5135Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			enumerationName_5135Parser = parser;
-		}
-		return enumerationName_5135Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser dataTypeName_5136Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getDataTypeName_5136Parser() {
-		if (dataTypeName_5136Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			dataTypeName_5136Parser = parser;
-		}
-		return dataTypeName_5136Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser actorName_5144Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getActorName_5144Parser() {
-		if (actorName_5144Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			actorName_5144Parser = parser;
-		}
-		return actorName_5144Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser deploymentSpecificationName_5145Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getDeploymentSpecificationName_5145Parser() {
-		if (deploymentSpecificationName_5145Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			deploymentSpecificationName_5145Parser = parser;
-		}
-		return deploymentSpecificationName_5145Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser artifactName_5146Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getArtifactName_5146Parser() {
-		if (artifactName_5146Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			artifactName_5146Parser = parser;
-		}
-		return artifactName_5146Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser informationItemName_5147Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getInformationItemName_5147Parser() {
-		if (informationItemName_5147Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			informationItemName_5147Parser = parser;
-		}
-		return informationItemName_5147Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser signalName_5148Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getSignalName_5148Parser() {
-		if (signalName_5148Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			signalName_5148Parser = parser;
-		}
-		return signalName_5148Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser useCaseName_5149Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getUseCaseName_5149Parser() {
-		if (useCaseName_5149Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			useCaseName_5149Parser = parser;
-		}
-		return useCaseName_5149Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private CommentParser commentBody_5150Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getCommentBody_5150Parser() {
-		if (commentBody_5150Parser == null) {
-			commentBody_5150Parser = new CommentParser();
-		}
-		return commentBody_5150Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser durationConstraintName_6040Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getDurationConstraintName_6040Parser() {
-		if (durationConstraintName_6040Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			durationConstraintName_6040Parser = parser;
-		}
-		return durationConstraintName_6040Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ConstraintParser durationConstraintSpecification_6041Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getDurationConstraintSpecification_6041Parser() {
-		if (durationConstraintSpecification_6041Parser == null) {
-			durationConstraintSpecification_6041Parser = new ConstraintParser();
-		}
-		return durationConstraintSpecification_6041Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser timeConstraintName_6042Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getTimeConstraintName_6042Parser() {
-		if (timeConstraintName_6042Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			timeConstraintName_6042Parser = parser;
-		}
-		return timeConstraintName_6042Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ConstraintParser timeConstraintSpecification_6043Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getTimeConstraintSpecification_6043Parser() {
-		if (timeConstraintSpecification_6043Parser == null) {
-			timeConstraintSpecification_6043Parser = new ConstraintParser();
-		}
-		return timeConstraintSpecification_6043Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser intervalConstraintName_6044Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getIntervalConstraintName_6044Parser() {
-		if (intervalConstraintName_6044Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			intervalConstraintName_6044Parser = parser;
-		}
-		return intervalConstraintName_6044Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ConstraintParser intervalConstraintSpecification_6045Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getIntervalConstraintSpecification_6045Parser() {
-		if (intervalConstraintSpecification_6045Parser == null) {
-			intervalConstraintSpecification_6045Parser = new ConstraintParser();
-		}
-		return intervalConstraintSpecification_6045Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser interactionConstraintName_6046Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getInteractionConstraintName_6046Parser() {
-		if (interactionConstraintName_6046Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			interactionConstraintName_6046Parser = parser;
-		}
-		return interactionConstraintName_6046Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ConstraintParser interactionConstraintSpecification_6047Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getInteractionConstraintSpecification_6047Parser() {
-		if (interactionConstraintSpecification_6047Parser == null) {
-			interactionConstraintSpecification_6047Parser = new ConstraintParser();
-		}
-		return interactionConstraintSpecification_6047Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser constraintName_6048Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getConstraintName_6048Parser() {
-		if (constraintName_6048Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			constraintName_6048Parser = parser;
-		}
-		return constraintName_6048Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private ConstraintParser constraintSpecification_6049Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getConstraintSpecification_6049Parser() {
-		if (constraintSpecification_6049Parser == null) {
-			constraintSpecification_6049Parser = new ConstraintParser();
-		}
-		return constraintSpecification_6049Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser property_3101Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getProperty_3101Parser() {
-		if (property_3101Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			property_3101Parser = parser;
-		}
-		return property_3101Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser operation_3102Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getOperation_3102Parser() {
-		if (operation_3102Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			operation_3102Parser = parser;
-		}
-		return operation_3102Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser enumerationLiteral_3066Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getEnumerationLiteral_3066Parser() {
-		if (enumerationLiteral_3066Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("{0}  "); //$NON-NLS-1$
-			parser.setEditorPattern("{0}"); //$NON-NLS-1$
-			parser.setEditPattern("{0}"); //$NON-NLS-1$
-			enumerationLiteral_3066Parser = parser;
-		}
-		return enumerationLiteral_3066Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser componentRealizationName_6001Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getComponentRealizationName_6001Parser() {
-		if (componentRealizationName_6001Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			componentRealizationName_6001Parser = parser;
-		}
-		return componentRealizationName_6001Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private AppliedStereotypeParser componentRealizationName_6015Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getComponentRealizationName_6015Parser() {
-		if (componentRealizationName_6015Parser == null) {
-			componentRealizationName_6015Parser = new AppliedStereotypeParser();
-		}
-		return componentRealizationName_6015Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser interfaceRealizationName_6002Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getInterfaceRealizationName_6002Parser() {
-		if (interfaceRealizationName_6002Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			interfaceRealizationName_6002Parser = parser;
-		}
-		return interfaceRealizationName_6002Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private AppliedStereotypeParser interfaceRealizationName_6016Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getInterfaceRealizationName_6016Parser() {
-		if (interfaceRealizationName_6016Parser == null) {
-			interfaceRealizationName_6016Parser = new AppliedStereotypeParser();
-		}
-		return interfaceRealizationName_6016Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser substitutionName_6003Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getSubstitutionName_6003Parser() {
-		if (substitutionName_6003Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			substitutionName_6003Parser = parser;
-		}
-		return substitutionName_6003Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private AppliedStereotypeParser substitutionName_6017Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getSubstitutionName_6017Parser() {
-		if (substitutionName_6017Parser == null) {
-			substitutionName_6017Parser = new AppliedStereotypeParser();
-		}
-		return substitutionName_6017Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser realizationName_6004Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getRealizationName_6004Parser() {
-		if (realizationName_6004Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			realizationName_6004Parser = parser;
-		}
-		return realizationName_6004Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private AppliedStereotypeParser realizationName_6018Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getRealizationName_6018Parser() {
-		if (realizationName_6018Parser == null) {
-			realizationName_6018Parser = new AppliedStereotypeParser();
-		}
-		return realizationName_6018Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser manifestationName_6005Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getManifestationName_6005Parser() {
-		if (manifestationName_6005Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			manifestationName_6005Parser = parser;
-		}
-		return manifestationName_6005Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private AppliedStereotypeParser manifestationName_6019Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getManifestationName_6019Parser() {
-		if (manifestationName_6019Parser == null) {
-			manifestationName_6019Parser = new AppliedStereotypeParser();
-		}
-		return manifestationName_6019Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser abstractionName_6006Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getAbstractionName_6006Parser() {
-		if (abstractionName_6006Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			abstractionName_6006Parser = parser;
-		}
-		return abstractionName_6006Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private AppliedStereotypeParser abstractionName_6020Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getAbstractionName_6020Parser() {
-		if (abstractionName_6020Parser == null) {
-			abstractionName_6020Parser = new AppliedStereotypeParser();
-		}
-		return abstractionName_6020Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser usageName_6007Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getUsageName_6007Parser() {
-		if (usageName_6007Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			usageName_6007Parser = parser;
-		}
-		return usageName_6007Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private AppliedStereotypeParser usageName_6021Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getUsageName_6021Parser() {
-		if (usageName_6021Parser == null) {
-			usageName_6021Parser = new AppliedStereotypeParser();
-		}
-		return usageName_6021Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser deploymentName_6008Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getDeploymentName_6008Parser() {
-		if (deploymentName_6008Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			deploymentName_6008Parser = parser;
-		}
-		return deploymentName_6008Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private AppliedStereotypeParser deploymentName_6022Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getDeploymentName_6022Parser() {
-		if (deploymentName_6022Parser == null) {
-			deploymentName_6022Parser = new AppliedStereotypeParser();
-		}
-		return deploymentName_6022Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private RoleBindingRoleNameParser dependencyName_6027Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getDependencyName_6027Parser() {
-		if (dependencyName_6027Parser == null) {
-			dependencyName_6027Parser = new RoleBindingRoleNameParser();
-		}
-		return dependencyName_6027Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private AppliedStereotypeParser dependencyName_6028Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getDependencyName_6028Parser() {
-		if (dependencyName_6028Parser == null) {
-			dependencyName_6028Parser = new AppliedStereotypeParser();
-		}
-		return dependencyName_6028Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser dependencyName_6009Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getDependencyName_6009Parser() {
-		if (dependencyName_6009Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			dependencyName_6009Parser = parser;
-		}
-		return dependencyName_6009Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private AppliedStereotypeParser dependencyName_6023Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getDependencyName_6023Parser() {
-		if (dependencyName_6023Parser == null) {
-			dependencyName_6023Parser = new AppliedStereotypeParser();
-		}
-		return dependencyName_6023Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private AppliedStereotypeParser connectorName_6025Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getConnectorName_6025Parser() {
-		if (connectorName_6025Parser == null) {
-			connectorName_6025Parser = new AppliedStereotypeParser();
-		}
-		return connectorName_6025Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser connectorName_6050Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getConnectorName_6050Parser() {
-		if (connectorName_6050Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			connectorName_6050Parser = parser;
-		}
-		return connectorName_6050Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser connectorName_6051Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getConnectorName_6051Parser() {
-		if (connectorName_6051Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("sourceMul{0}"); //$NON-NLS-1$
-			parser.setEditorPattern("sourceMul{0}"); //$NON-NLS-1$
-			parser.setEditPattern("sourceMul{0}"); //$NON-NLS-1$
-			connectorName_6051Parser = parser;
-		}
-		return connectorName_6051Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IParser connectorName_6052Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getConnectorName_6052Parser() {
-		if (connectorName_6052Parser == null) {
-			EAttribute[] features = new EAttribute[] {
-					UMLPackage.eINSTANCE.getNamedElement_Name()
-			};
-			MessageFormatParser parser = new MessageFormatParser(features);
-			parser.setViewPattern("targetMul{0}"); //$NON-NLS-1$
-			parser.setEditorPattern("targetMul{0}"); //$NON-NLS-1$
-			parser.setEditPattern("targetMul{0}"); //$NON-NLS-1$
-			connectorName_6052Parser = parser;
-		}
-		return connectorName_6052Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private AppliedStereotypeParser generalizationIsSubstitutable_6024Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getGeneralizationIsSubstitutable_6024Parser() {
-		if (generalizationIsSubstitutable_6024Parser == null) {
-			generalizationIsSubstitutable_6024Parser = new AppliedStereotypeParser();
-		}
-		return generalizationIsSubstitutable_6024Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	private AppliedStereotypeParser informationFlowName_6032Parser;
-
-	/**
-	 * @generated
-	 */
-	private IParser getInformationFlowName_6032Parser() {
-		if (informationFlowName_6032Parser == null) {
-			informationFlowName_6032Parser = new AppliedStereotypeParser();
-		}
-		return informationFlowName_6032Parser;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IParser getParser(int visualID) {
-		switch (visualID) {
-		case ActivityCompositeNameEditPart.VISUAL_ID:
-			return getActivityName_5112Parser();
-		case InteractionCompositeNameEditPart.VISUAL_ID:
-			return getInteractionName_5113Parser();
-		case ProtocolStateMachineCompositeNameEditPart.VISUAL_ID:
-			return getProtocolStateMachineName_5114Parser();
-		case StateMachineCompositeNameEditPart.VISUAL_ID:
-			return getStateMachineName_5115Parser();
-		case FunctionBehaviorCompositeNameEditPart.VISUAL_ID:
-			return getFunctionBehaviorName_5116Parser();
-		case OpaqueBehaviorCompositeNameEditPart.VISUAL_ID:
-			return getOpaqueBehaviorName_5117Parser();
-		case ComponentCompositeNameEditPart.VISUAL_ID:
-			return getComponentName_5121Parser();
-		case DeviceCompositeNameEditPart.VISUAL_ID:
-			return getDeviceName_5122Parser();
-		case ExecutionEnvironmentCompositeNameEditPart.VISUAL_ID:
-			return getExecutionEnvironmentName_5123Parser();
-		case NodeCompositeNameEditPart.VISUAL_ID:
-			return getNodeName_5124Parser();
-		case ClassCompositeNameEditPart.VISUAL_ID:
-			return getClassName_5156Parser();
-		case CollaborationCompositeNameEditPart.VISUAL_ID:
-			return getCollaborationName_5158Parser();
-		case InterfaceNameEditPart.VISUAL_ID:
-			return getInterfaceName_5159Parser();
-		case PrimitiveTypeNameEditPart.VISUAL_ID:
-			return getPrimitiveTypeName_5118Parser();
-		case EnumerationNameEditPart.VISUAL_ID:
-			return getEnumerationName_5119Parser();
-		case DataTypeNameEditPart.VISUAL_ID:
-			return getDataTypeName_5120Parser();
-		case ActorNameEditPart.VISUAL_ID:
-			return getActorName_5160Parser();
-		case DeploymentSpecificationNameEditPart.VISUAL_ID:
-			return getDeploymentSpecificationName_5161Parser();
-		case ArtifactNameEditPart.VISUAL_ID:
-			return getArtifactName_5162Parser();
-		case InformationItemNameEditPart.VISUAL_ID:
-			return getInformationItemName_5163Parser();
-		case SignalNameEditPart.VISUAL_ID:
-			return getSignalName_5164Parser();
-		case UseCaseNameEditPart.VISUAL_ID:
-			return getUseCaseName_5165Parser();
-		case SignalEventNameEditPart.VISUAL_ID:
-			return getSignalEventName_5166Parser();
-		case CallEventNameEditPart.VISUAL_ID:
-			return getCallEventName_5167Parser();
-		case AnyReceiveEventNameEditPart.VISUAL_ID:
-			return getAnyReceiveEventName_5168Parser();
-		case ChangeEventNameEditPart.VISUAL_ID:
-			return getChangeEventName_5171Parser();
-		case TimeEventNameEditPart.VISUAL_ID:
-			return getTimeEventName_5172Parser();
-		case DurationObservationNameEditPart.VISUAL_ID:
-			return getDurationObservationName_5151Parser();
-		case DurationObservationStereotypeLabelEditPart.VISUAL_ID:
-			return getDurationObservationName_5152Parser();
-		case TimeObservationNameEditPart.VISUAL_ID:
-			return getTimeObservationName_5142Parser();
-		case TimeObservationStereotypeLabelEditPart.VISUAL_ID:
-			return getTimeObservationName_5143Parser();
-		case LiteralBooleanNameEditPart.VISUAL_ID:
-			return getLiteralBooleanName_5178Parser();
-		case LiteralIntegerNameEditPart.VISUAL_ID:
-			return getLiteralIntegerName_5179Parser();
-		case LiteralNullNameEditPart.VISUAL_ID:
-			return getLiteralNullName_5180Parser();
-		case LiteralStringNameEditPart.VISUAL_ID:
-			return getLiteralStringName_5181Parser();
-		case LiteralUnlimitedNaturalNameEditPart.VISUAL_ID:
-			return getLiteralUnlimitedNaturalName_5182Parser();
-		case StringExpressionNameEditPart.VISUAL_ID:
-			return getStringExpressionName_5183Parser();
-		case OpaqueExpressionNameEditPart.VISUAL_ID:
-			return getOpaqueExpressionName_5184Parser();
-		case TimeExpressionNameEditPart.VISUAL_ID:
-			return getTimeExpressionName_5185Parser();
-		case ExpressionNameEditPart.VISUAL_ID:
-			return getExpressionName_5186Parser();
-		case DurationNameEditPart.VISUAL_ID:
-			return getDurationName_5187Parser();
-		case TimeIntervalNameEditPart.VISUAL_ID:
-			return getTimeIntervalName_5188Parser();
-		case DurationIntervalNameEditPart.VISUAL_ID:
-			return getDurationIntervalName_5189Parser();
-		case IntervalNameEditPart.VISUAL_ID:
-			return getIntervalName_5190Parser();
-		case InstanceValueNameEditPart.VISUAL_ID:
-			return getInstanceValueName_5191Parser();
-		case CommentBodyEditPart.VISUAL_ID:
-			return getCommentBody_5192Parser();
-		case DurationConstraintNameEditPart.VISUAL_ID:
-			return getDurationConstraintName_5193Parser();
-		case DurationConstraintSpecificationEditPart.VISUAL_ID:
-			return getDurationConstraintSpecification_6035Parser();
-		case TimeConstraintNameEditPart.VISUAL_ID:
-			return getTimeConstraintName_5194Parser();
-		case TimeConstraintSpecificationEditPart.VISUAL_ID:
-			return getTimeConstraintSpecification_6036Parser();
-		case IntervalConstraintNameEditPart.VISUAL_ID:
-			return getIntervalConstraintName_5195Parser();
-		case IntervalConstraintSpecificationEditPart.VISUAL_ID:
-			return getIntervalConstraintSpecification_6037Parser();
-		case InteractionConstraintNameEditPart.VISUAL_ID:
-			return getInteractionConstraintName_5196Parser();
-		case InteractionConstraintSpecificationEditPart.VISUAL_ID:
-			return getInteractionConstraintSpecification_6038Parser();
-		case ConstraintNameEditPart.VISUAL_ID:
-			return getConstraintName_5197Parser();
-		case ConstraintSpecificationEditPart.VISUAL_ID:
-			return getConstraintSpecification_6039Parser();
-		case PortNameEditPart.VISUAL_ID:
-			return getPortName_5125Parser();
-		case PortAppliedStereotypeEditPart.VISUAL_ID:
-			return getPortName_6029Parser();
-		case ParameterNameEditPart.VISUAL_ID:
-			return getParameterName_6033Parser();
-		case ParameterAppliedStereotypeEditPart.VISUAL_ID:
-			return getParameterName_6034Parser();
-		case PropertyPartNameEditPartCN.VISUAL_ID:
-			return getPropertyName_5126Parser();
-		case CollaborationRoleNameEditPartCN.VISUAL_ID:
-			return getConnectableElementName_5198Parser();
-		case CollaborationUseNameEditPart.VISUAL_ID:
-			return getCollaborationUseName_5127Parser();
-		case ActivityCompositeNameEditPartCN.VISUAL_ID:
-			return getActivityName_5128Parser();
-		case InteractionCompositeNameEditPartCN.VISUAL_ID:
-			return getInteractionName_5129Parser();
-		case ProtocolStateMachineCompositeNameEditPartCN.VISUAL_ID:
-			return getProtocolStateMachineName_5130Parser();
-		case StateMachineCompositeNameEditPartCN.VISUAL_ID:
-			return getStateMachineName_5131Parser();
-		case FunctionBehaviorCompositeNameEditPartCN.VISUAL_ID:
-			return getFunctionBehaviorName_5132Parser();
-		case OpaqueBehaviorCompositeNameEditPartCN.VISUAL_ID:
-			return getOpaqueBehaviorName_5133Parser();
-		case ComponentCompositeNameEditPartCN.VISUAL_ID:
-			return getComponentName_5137Parser();
-		case DeviceCompositeNameEditPartCN.VISUAL_ID:
-			return getDeviceName_5138Parser();
-		case ExecutionEnvironmentCompositeNameEditPartCN.VISUAL_ID:
-			return getExecutionEnvironmentName_5139Parser();
-		case NodeCompositeNameEditPartCN.VISUAL_ID:
-			return getNodeName_5140Parser();
-		case ClassCompositeNameEditPartCN.VISUAL_ID:
-			return getClassName_5155Parser();
-		case CollaborationCompositeNameEditPartCN.VISUAL_ID:
-			return getCollaborationName_5141Parser();
-		case InterfaceNameEditPartCN.VISUAL_ID:
-			return getInterfaceName_5154Parser();
-		case PrimitiveTypeNameEditPartCN.VISUAL_ID:
-			return getPrimitiveTypeName_5134Parser();
-		case EnumerationNameEditPartCN.VISUAL_ID:
-			return getEnumerationName_5135Parser();
-		case DataTypeNameEditPartCN.VISUAL_ID:
-			return getDataTypeName_5136Parser();
-		case ActorNameEditPartCN.VISUAL_ID:
-			return getActorName_5144Parser();
-		case DeploymentSpecificationNameEditPartCN.VISUAL_ID:
-			return getDeploymentSpecificationName_5145Parser();
-		case ArtifactNameEditPartCN.VISUAL_ID:
-			return getArtifactName_5146Parser();
-		case InformationItemNameEditPartCN.VISUAL_ID:
-			return getInformationItemName_5147Parser();
-		case SignalNameEditPartCN.VISUAL_ID:
-			return getSignalName_5148Parser();
-		case UseCaseNameEditPartCN.VISUAL_ID:
-			return getUseCaseName_5149Parser();
-		case CommentBodyEditPartCN.VISUAL_ID:
-			return getCommentBody_5150Parser();
-		case DurationConstraintNameEditPartCN.VISUAL_ID:
-			return getDurationConstraintName_6040Parser();
-		case DurationConstraintSpecificationEditPartCN.VISUAL_ID:
-			return getDurationConstraintSpecification_6041Parser();
-		case TimeConstraintNameEditPartCN.VISUAL_ID:
-			return getTimeConstraintName_6042Parser();
-		case TimeConstraintSpecificationEditPartCN.VISUAL_ID:
-			return getTimeConstraintSpecification_6043Parser();
-		case IntervalConstraintNameEditPartCN.VISUAL_ID:
-			return getIntervalConstraintName_6044Parser();
-		case IntervalConstraintSpecificationEditPartCN.VISUAL_ID:
-			return getIntervalConstraintSpecification_6045Parser();
-		case InteractionConstraintNameEditPartCN.VISUAL_ID:
-			return getInteractionConstraintName_6046Parser();
-		case InteractionConstraintSpecificationEditPartCN.VISUAL_ID:
-			return getInteractionConstraintSpecification_6047Parser();
-		case ConstraintNameEditPartCN.VISUAL_ID:
-			return getConstraintName_6048Parser();
-		case ConstraintSpecificationEditPartCN.VISUAL_ID:
-			return getConstraintSpecification_6049Parser();
-		case PropertyEditPartCLN.VISUAL_ID:
-			return getProperty_3101Parser();
-		case OperationEditPartCLN.VISUAL_ID:
-			return getOperation_3102Parser();
-		case EnumerationLiteralEditPartCLN.VISUAL_ID:
-			return getEnumerationLiteral_3066Parser();
-		case ComponentRealizationNameEditPart.VISUAL_ID:
-			return getComponentRealizationName_6001Parser();
-		case ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID:
-			return getComponentRealizationName_6015Parser();
-		case InterfaceRealizationNameEditPart.VISUAL_ID:
-			return getInterfaceRealizationName_6002Parser();
-		case InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID:
-			return getInterfaceRealizationName_6016Parser();
-		case SubstitutionNameEditPart.VISUAL_ID:
-			return getSubstitutionName_6003Parser();
-		case SubstitutionAppliedStereotypeEditPart.VISUAL_ID:
-			return getSubstitutionName_6017Parser();
-		case RealizationNameEditPart.VISUAL_ID:
-			return getRealizationName_6004Parser();
-		case RealizationAppliedStereotypeEditPart.VISUAL_ID:
-			return getRealizationName_6018Parser();
-		case ManifestationNameEditPart.VISUAL_ID:
-			return getManifestationName_6005Parser();
-		case ManifestationAppliedStereotypeEditPart.VISUAL_ID:
-			return getManifestationName_6019Parser();
-		case AbstractionNameEditPart.VISUAL_ID:
-			return getAbstractionName_6006Parser();
-		case AbstractionAppliedStereotypeEditPart.VISUAL_ID:
-			return getAbstractionName_6020Parser();
-		case UsageNameEditPart.VISUAL_ID:
-			return getUsageName_6007Parser();
-		case UsageAppliedStereotypeEditPart.VISUAL_ID:
-			return getUsageName_6021Parser();
-		case DeploymentNameEditPart.VISUAL_ID:
-			return getDeploymentName_6008Parser();
-		case DeploymentAppliedStereotypeEditPart.VISUAL_ID:
-			return getDeploymentName_6022Parser();
-		case RoleBindingRoleNameEditPart.VISUAL_ID:
-			return getDependencyName_6027Parser();
-		case RoleBindingAppliedStereotypeEditPart.VISUAL_ID:
-			return getDependencyName_6028Parser();
-		case DependencyNameEditPart.VISUAL_ID:
-			return getDependencyName_6009Parser();
-		case DependencyAppliedStereotypeEditPart.VISUAL_ID:
-			return getDependencyName_6023Parser();
-		case ConnectorAppliedStereotypeEditPart.VISUAL_ID:
-			return getConnectorName_6025Parser();
-		case ConnectorNameEditPart.VISUAL_ID:
-			return getConnectorName_6050Parser();
-		case ConnectorMultiplicitySourceEditPart.VISUAL_ID:
-			return getConnectorName_6051Parser();
-		case ConnectorMultiplicityTargetEditPart.VISUAL_ID:
-			return getConnectorName_6052Parser();
-		case GeneralizationAppliedStereotypeEditPart.VISUAL_ID:
-			return getGeneralizationIsSubstitutable_6024Parser();
-		case InformationFlowAppliedStereotypeEditPart.VISUAL_ID:
-			return getInformationFlowName_6032Parser();
-		}
-		return null;
-	}
-
-	/**
-	 * Utility method that consults ParserService
-	 * @generated
-	 */
-	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) {
-			return getParser(UMLVisualIDRegistry.getVisualID(vid));
-		}
-		View view =
-				(View) hint.getAdapter(View.class);
-		if (view != null) {
-			return getParser(UMLVisualIDRegistry.getVisualID(view));
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean provides(IOperation operation) {
-		if (operation instanceof GetParserOperation) {
-			IAdaptable hint =
-					((GetParserOperation) operation).getHint();
-			if (UMLElementTypes.getElement(hint) == null) {
-				return false;
-			}
-			return getParser(hint) != null;
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class HintAdapter extends ParserHintAdapter {
-		/**
-		 * @generated
-		 */
-		private final IElementType elementType;
-
-		/**
-		 * @generated
-		 */
-		public HintAdapter(IElementType type,
-				EObject object, String parserHint) {
-			super(object, parserHint);
-			assert type != null;
-			elementType = type;
-		}
-
-		/**
-		 * @generated
-		 */
-		public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
-			if (IElementType.class.equals(adapter)) {
-				return elementType;
-			}
-			return super.getAdapter(adapter);
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.providers;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.emf.ecore.EAttribute;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;

+import org.eclipse.gmf.runtime.common.core.service.IOperation;

+import org.eclipse.gmf.runtime.common.ui.services.parser.GetParserOperation;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParser;

+import org.eclipse.gmf.runtime.common.ui.services.parser.IParserProvider;

+import org.eclipse.gmf.runtime.common.ui.services.parser.ParserService;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.common.parser.CommentParser;

+import org.eclipse.papyrus.uml.diagram.common.parser.ConstraintParser;

+import org.eclipse.papyrus.uml.diagram.common.parser.stereotype.AppliedStereotypeParser;

+import org.eclipse.papyrus.uml.diagram.composite.custom.parsers.RoleBindingRoleNameParser;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.*;

+import org.eclipse.papyrus.uml.diagram.composite.parsers.MessageFormatParser;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.uml2.uml.UMLPackage;

+

+/**

+ * @generated

+ */

+public class UMLParserProvider extends AbstractProvider implements IParserProvider {

+

+	/**

+	 * @generated

+	 */

+	private IParser activityName_5112Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getActivityName_5112Parser() {

+		if(activityName_5112Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			activityName_5112Parser = parser;

+		}

+		return activityName_5112Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser interactionName_5113Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getInteractionName_5113Parser() {

+		if(interactionName_5113Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			interactionName_5113Parser = parser;

+		}

+		return interactionName_5113Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser protocolStateMachineName_5114Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getProtocolStateMachineName_5114Parser() {

+		if(protocolStateMachineName_5114Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			protocolStateMachineName_5114Parser = parser;

+		}

+		return protocolStateMachineName_5114Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser stateMachineName_5115Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getStateMachineName_5115Parser() {

+		if(stateMachineName_5115Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			stateMachineName_5115Parser = parser;

+		}

+		return stateMachineName_5115Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser functionBehaviorName_5116Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getFunctionBehaviorName_5116Parser() {

+		if(functionBehaviorName_5116Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			functionBehaviorName_5116Parser = parser;

+		}

+		return functionBehaviorName_5116Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser opaqueBehaviorName_5117Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getOpaqueBehaviorName_5117Parser() {

+		if(opaqueBehaviorName_5117Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			opaqueBehaviorName_5117Parser = parser;

+		}

+		return opaqueBehaviorName_5117Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser componentName_5121Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getComponentName_5121Parser() {

+		if(componentName_5121Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			componentName_5121Parser = parser;

+		}

+		return componentName_5121Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser deviceName_5122Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getDeviceName_5122Parser() {

+		if(deviceName_5122Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			deviceName_5122Parser = parser;

+		}

+		return deviceName_5122Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser executionEnvironmentName_5123Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getExecutionEnvironmentName_5123Parser() {

+		if(executionEnvironmentName_5123Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			executionEnvironmentName_5123Parser = parser;

+		}

+		return executionEnvironmentName_5123Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser nodeName_5124Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getNodeName_5124Parser() {

+		if(nodeName_5124Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			nodeName_5124Parser = parser;

+		}

+		return nodeName_5124Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser className_5156Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getClassName_5156Parser() {

+		if(className_5156Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			className_5156Parser = parser;

+		}

+		return className_5156Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser collaborationName_5158Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getCollaborationName_5158Parser() {

+		if(collaborationName_5158Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			collaborationName_5158Parser = parser;

+		}

+		return collaborationName_5158Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser interfaceName_5159Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getInterfaceName_5159Parser() {

+		if(interfaceName_5159Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			interfaceName_5159Parser = parser;

+		}

+		return interfaceName_5159Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser primitiveTypeName_5118Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getPrimitiveTypeName_5118Parser() {

+		if(primitiveTypeName_5118Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			primitiveTypeName_5118Parser = parser;

+		}

+		return primitiveTypeName_5118Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser enumerationName_5119Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getEnumerationName_5119Parser() {

+		if(enumerationName_5119Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			enumerationName_5119Parser = parser;

+		}

+		return enumerationName_5119Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser dataTypeName_5120Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getDataTypeName_5120Parser() {

+		if(dataTypeName_5120Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			dataTypeName_5120Parser = parser;

+		}

+		return dataTypeName_5120Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser actorName_5160Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getActorName_5160Parser() {

+		if(actorName_5160Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			actorName_5160Parser = parser;

+		}

+		return actorName_5160Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser deploymentSpecificationName_5161Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getDeploymentSpecificationName_5161Parser() {

+		if(deploymentSpecificationName_5161Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			deploymentSpecificationName_5161Parser = parser;

+		}

+		return deploymentSpecificationName_5161Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser artifactName_5162Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getArtifactName_5162Parser() {

+		if(artifactName_5162Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			artifactName_5162Parser = parser;

+		}

+		return artifactName_5162Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser informationItemName_5163Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getInformationItemName_5163Parser() {

+		if(informationItemName_5163Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			informationItemName_5163Parser = parser;

+		}

+		return informationItemName_5163Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser signalName_5164Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSignalName_5164Parser() {

+		if(signalName_5164Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			signalName_5164Parser = parser;

+		}

+		return signalName_5164Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser useCaseName_5165Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getUseCaseName_5165Parser() {

+		if(useCaseName_5165Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			useCaseName_5165Parser = parser;

+		}

+		return useCaseName_5165Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser signalEventName_5166Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSignalEventName_5166Parser() {

+		if(signalEventName_5166Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			signalEventName_5166Parser = parser;

+		}

+		return signalEventName_5166Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser callEventName_5167Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getCallEventName_5167Parser() {

+		if(callEventName_5167Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			callEventName_5167Parser = parser;

+		}

+		return callEventName_5167Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser anyReceiveEventName_5168Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getAnyReceiveEventName_5168Parser() {

+		if(anyReceiveEventName_5168Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			anyReceiveEventName_5168Parser = parser;

+		}

+		return anyReceiveEventName_5168Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser changeEventName_5171Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getChangeEventName_5171Parser() {

+		if(changeEventName_5171Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			changeEventName_5171Parser = parser;

+		}

+		return changeEventName_5171Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser timeEventName_5172Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getTimeEventName_5172Parser() {

+		if(timeEventName_5172Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			timeEventName_5172Parser = parser;

+		}

+		return timeEventName_5172Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser durationObservationName_5151Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getDurationObservationName_5151Parser() {

+		if(durationObservationName_5151Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			durationObservationName_5151Parser = parser;

+		}

+		return durationObservationName_5151Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private AppliedStereotypeParser durationObservationName_5152Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getDurationObservationName_5152Parser() {

+		if(durationObservationName_5152Parser == null) {

+			durationObservationName_5152Parser = new AppliedStereotypeParser();

+		}

+		return durationObservationName_5152Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser timeObservationName_5142Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getTimeObservationName_5142Parser() {

+		if(timeObservationName_5142Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			timeObservationName_5142Parser = parser;

+		}

+		return timeObservationName_5142Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private AppliedStereotypeParser timeObservationName_5143Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getTimeObservationName_5143Parser() {

+		if(timeObservationName_5143Parser == null) {

+			timeObservationName_5143Parser = new AppliedStereotypeParser();

+		}

+		return timeObservationName_5143Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser literalBooleanName_5178Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getLiteralBooleanName_5178Parser() {

+		if(literalBooleanName_5178Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			literalBooleanName_5178Parser = parser;

+		}

+		return literalBooleanName_5178Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser literalIntegerName_5179Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getLiteralIntegerName_5179Parser() {

+		if(literalIntegerName_5179Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			literalIntegerName_5179Parser = parser;

+		}

+		return literalIntegerName_5179Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser literalNullName_5180Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getLiteralNullName_5180Parser() {

+		if(literalNullName_5180Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			literalNullName_5180Parser = parser;

+		}

+		return literalNullName_5180Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser literalStringName_5181Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getLiteralStringName_5181Parser() {

+		if(literalStringName_5181Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			literalStringName_5181Parser = parser;

+		}

+		return literalStringName_5181Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser literalUnlimitedNaturalName_5182Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getLiteralUnlimitedNaturalName_5182Parser() {

+		if(literalUnlimitedNaturalName_5182Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			literalUnlimitedNaturalName_5182Parser = parser;

+		}

+		return literalUnlimitedNaturalName_5182Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser stringExpressionName_5183Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getStringExpressionName_5183Parser() {

+		if(stringExpressionName_5183Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			stringExpressionName_5183Parser = parser;

+		}

+		return stringExpressionName_5183Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser opaqueExpressionName_5184Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getOpaqueExpressionName_5184Parser() {

+		if(opaqueExpressionName_5184Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			opaqueExpressionName_5184Parser = parser;

+		}

+		return opaqueExpressionName_5184Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser timeExpressionName_5185Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getTimeExpressionName_5185Parser() {

+		if(timeExpressionName_5185Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			timeExpressionName_5185Parser = parser;

+		}

+		return timeExpressionName_5185Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser expressionName_5186Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getExpressionName_5186Parser() {

+		if(expressionName_5186Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			expressionName_5186Parser = parser;

+		}

+		return expressionName_5186Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser durationName_5187Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getDurationName_5187Parser() {

+		if(durationName_5187Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			durationName_5187Parser = parser;

+		}

+		return durationName_5187Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser timeIntervalName_5188Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getTimeIntervalName_5188Parser() {

+		if(timeIntervalName_5188Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			timeIntervalName_5188Parser = parser;

+		}

+		return timeIntervalName_5188Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser durationIntervalName_5189Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getDurationIntervalName_5189Parser() {

+		if(durationIntervalName_5189Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			durationIntervalName_5189Parser = parser;

+		}

+		return durationIntervalName_5189Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser intervalName_5190Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getIntervalName_5190Parser() {

+		if(intervalName_5190Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			intervalName_5190Parser = parser;

+		}

+		return intervalName_5190Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser instanceValueName_5191Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getInstanceValueName_5191Parser() {

+		if(instanceValueName_5191Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			instanceValueName_5191Parser = parser;

+		}

+		return instanceValueName_5191Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private CommentParser commentBody_5192Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getCommentBody_5192Parser() {

+		if(commentBody_5192Parser == null) {

+			commentBody_5192Parser = new CommentParser();

+		}

+		return commentBody_5192Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser durationConstraintName_5193Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getDurationConstraintName_5193Parser() {

+		if(durationConstraintName_5193Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			durationConstraintName_5193Parser = parser;

+		}

+		return durationConstraintName_5193Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ConstraintParser durationConstraintSpecification_6035Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getDurationConstraintSpecification_6035Parser() {

+		if(durationConstraintSpecification_6035Parser == null) {

+			durationConstraintSpecification_6035Parser = new ConstraintParser();

+		}

+		return durationConstraintSpecification_6035Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser timeConstraintName_5194Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getTimeConstraintName_5194Parser() {

+		if(timeConstraintName_5194Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			timeConstraintName_5194Parser = parser;

+		}

+		return timeConstraintName_5194Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ConstraintParser timeConstraintSpecification_6036Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getTimeConstraintSpecification_6036Parser() {

+		if(timeConstraintSpecification_6036Parser == null) {

+			timeConstraintSpecification_6036Parser = new ConstraintParser();

+		}

+		return timeConstraintSpecification_6036Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser intervalConstraintName_5195Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getIntervalConstraintName_5195Parser() {

+		if(intervalConstraintName_5195Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			intervalConstraintName_5195Parser = parser;

+		}

+		return intervalConstraintName_5195Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ConstraintParser intervalConstraintSpecification_6037Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getIntervalConstraintSpecification_6037Parser() {

+		if(intervalConstraintSpecification_6037Parser == null) {

+			intervalConstraintSpecification_6037Parser = new ConstraintParser();

+		}

+		return intervalConstraintSpecification_6037Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser interactionConstraintName_5196Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getInteractionConstraintName_5196Parser() {

+		if(interactionConstraintName_5196Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			interactionConstraintName_5196Parser = parser;

+		}

+		return interactionConstraintName_5196Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ConstraintParser interactionConstraintSpecification_6038Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getInteractionConstraintSpecification_6038Parser() {

+		if(interactionConstraintSpecification_6038Parser == null) {

+			interactionConstraintSpecification_6038Parser = new ConstraintParser();

+		}

+		return interactionConstraintSpecification_6038Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser constraintName_5197Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getConstraintName_5197Parser() {

+		if(constraintName_5197Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			constraintName_5197Parser = parser;

+		}

+		return constraintName_5197Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ConstraintParser constraintSpecification_6039Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getConstraintSpecification_6039Parser() {

+		if(constraintSpecification_6039Parser == null) {

+			constraintSpecification_6039Parser = new ConstraintParser();

+		}

+		return constraintSpecification_6039Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser portName_5125Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getPortName_5125Parser() {

+		if(portName_5125Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			portName_5125Parser = parser;

+		}

+		return portName_5125Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private AppliedStereotypeParser portName_6029Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getPortName_6029Parser() {

+		if(portName_6029Parser == null) {

+			portName_6029Parser = new AppliedStereotypeParser();

+		}

+		return portName_6029Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser parameterName_6033Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getParameterName_6033Parser() {

+		if(parameterName_6033Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parameterName_6033Parser = parser;

+		}

+		return parameterName_6033Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private AppliedStereotypeParser parameterName_6034Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getParameterName_6034Parser() {

+		if(parameterName_6034Parser == null) {

+			parameterName_6034Parser = new AppliedStereotypeParser();

+		}

+		return parameterName_6034Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser propertyName_5126Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getPropertyName_5126Parser() {

+		if(propertyName_5126Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			propertyName_5126Parser = parser;

+		}

+		return propertyName_5126Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser connectableElementName_5198Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getConnectableElementName_5198Parser() {

+		if(connectableElementName_5198Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}"); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			connectableElementName_5198Parser = parser;

+		}

+		return connectableElementName_5198Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser collaborationUseName_5127Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getCollaborationUseName_5127Parser() {

+		if(collaborationUseName_5127Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			collaborationUseName_5127Parser = parser;

+		}

+		return collaborationUseName_5127Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser activityName_5128Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getActivityName_5128Parser() {

+		if(activityName_5128Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			activityName_5128Parser = parser;

+		}

+		return activityName_5128Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser interactionName_5129Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getInteractionName_5129Parser() {

+		if(interactionName_5129Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			interactionName_5129Parser = parser;

+		}

+		return interactionName_5129Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser protocolStateMachineName_5130Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getProtocolStateMachineName_5130Parser() {

+		if(protocolStateMachineName_5130Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			protocolStateMachineName_5130Parser = parser;

+		}

+		return protocolStateMachineName_5130Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser stateMachineName_5131Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getStateMachineName_5131Parser() {

+		if(stateMachineName_5131Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			stateMachineName_5131Parser = parser;

+		}

+		return stateMachineName_5131Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser functionBehaviorName_5132Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getFunctionBehaviorName_5132Parser() {

+		if(functionBehaviorName_5132Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			functionBehaviorName_5132Parser = parser;

+		}

+		return functionBehaviorName_5132Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser opaqueBehaviorName_5133Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getOpaqueBehaviorName_5133Parser() {

+		if(opaqueBehaviorName_5133Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			opaqueBehaviorName_5133Parser = parser;

+		}

+		return opaqueBehaviorName_5133Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser componentName_5137Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getComponentName_5137Parser() {

+		if(componentName_5137Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			componentName_5137Parser = parser;

+		}

+		return componentName_5137Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser deviceName_5138Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getDeviceName_5138Parser() {

+		if(deviceName_5138Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			deviceName_5138Parser = parser;

+		}

+		return deviceName_5138Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser executionEnvironmentName_5139Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getExecutionEnvironmentName_5139Parser() {

+		if(executionEnvironmentName_5139Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			executionEnvironmentName_5139Parser = parser;

+		}

+		return executionEnvironmentName_5139Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser nodeName_5140Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getNodeName_5140Parser() {

+		if(nodeName_5140Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			nodeName_5140Parser = parser;

+		}

+		return nodeName_5140Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser className_5155Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getClassName_5155Parser() {

+		if(className_5155Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			className_5155Parser = parser;

+		}

+		return className_5155Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser collaborationName_5141Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getCollaborationName_5141Parser() {

+		if(collaborationName_5141Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			collaborationName_5141Parser = parser;

+		}

+		return collaborationName_5141Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser interfaceName_5154Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getInterfaceName_5154Parser() {

+		if(interfaceName_5154Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			interfaceName_5154Parser = parser;

+		}

+		return interfaceName_5154Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser primitiveTypeName_5134Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getPrimitiveTypeName_5134Parser() {

+		if(primitiveTypeName_5134Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			primitiveTypeName_5134Parser = parser;

+		}

+		return primitiveTypeName_5134Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser enumerationName_5135Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getEnumerationName_5135Parser() {

+		if(enumerationName_5135Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			enumerationName_5135Parser = parser;

+		}

+		return enumerationName_5135Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser dataTypeName_5136Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getDataTypeName_5136Parser() {

+		if(dataTypeName_5136Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			dataTypeName_5136Parser = parser;

+		}

+		return dataTypeName_5136Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser actorName_5144Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getActorName_5144Parser() {

+		if(actorName_5144Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			actorName_5144Parser = parser;

+		}

+		return actorName_5144Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser deploymentSpecificationName_5145Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getDeploymentSpecificationName_5145Parser() {

+		if(deploymentSpecificationName_5145Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			deploymentSpecificationName_5145Parser = parser;

+		}

+		return deploymentSpecificationName_5145Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser artifactName_5146Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getArtifactName_5146Parser() {

+		if(artifactName_5146Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			artifactName_5146Parser = parser;

+		}

+		return artifactName_5146Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser informationItemName_5147Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getInformationItemName_5147Parser() {

+		if(informationItemName_5147Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			informationItemName_5147Parser = parser;

+		}

+		return informationItemName_5147Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser signalName_5148Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSignalName_5148Parser() {

+		if(signalName_5148Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			signalName_5148Parser = parser;

+		}

+		return signalName_5148Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser useCaseName_5149Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getUseCaseName_5149Parser() {

+		if(useCaseName_5149Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			useCaseName_5149Parser = parser;

+		}

+		return useCaseName_5149Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private CommentParser commentBody_5150Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getCommentBody_5150Parser() {

+		if(commentBody_5150Parser == null) {

+			commentBody_5150Parser = new CommentParser();

+		}

+		return commentBody_5150Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser durationConstraintName_6040Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getDurationConstraintName_6040Parser() {

+		if(durationConstraintName_6040Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			durationConstraintName_6040Parser = parser;

+		}

+		return durationConstraintName_6040Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ConstraintParser durationConstraintSpecification_6041Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getDurationConstraintSpecification_6041Parser() {

+		if(durationConstraintSpecification_6041Parser == null) {

+			durationConstraintSpecification_6041Parser = new ConstraintParser();

+		}

+		return durationConstraintSpecification_6041Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser timeConstraintName_6042Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getTimeConstraintName_6042Parser() {

+		if(timeConstraintName_6042Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			timeConstraintName_6042Parser = parser;

+		}

+		return timeConstraintName_6042Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ConstraintParser timeConstraintSpecification_6043Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getTimeConstraintSpecification_6043Parser() {

+		if(timeConstraintSpecification_6043Parser == null) {

+			timeConstraintSpecification_6043Parser = new ConstraintParser();

+		}

+		return timeConstraintSpecification_6043Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser intervalConstraintName_6044Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getIntervalConstraintName_6044Parser() {

+		if(intervalConstraintName_6044Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			intervalConstraintName_6044Parser = parser;

+		}

+		return intervalConstraintName_6044Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ConstraintParser intervalConstraintSpecification_6045Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getIntervalConstraintSpecification_6045Parser() {

+		if(intervalConstraintSpecification_6045Parser == null) {

+			intervalConstraintSpecification_6045Parser = new ConstraintParser();

+		}

+		return intervalConstraintSpecification_6045Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser interactionConstraintName_6046Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getInteractionConstraintName_6046Parser() {

+		if(interactionConstraintName_6046Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			interactionConstraintName_6046Parser = parser;

+		}

+		return interactionConstraintName_6046Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ConstraintParser interactionConstraintSpecification_6047Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getInteractionConstraintSpecification_6047Parser() {

+		if(interactionConstraintSpecification_6047Parser == null) {

+			interactionConstraintSpecification_6047Parser = new ConstraintParser();

+		}

+		return interactionConstraintSpecification_6047Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser constraintName_6048Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getConstraintName_6048Parser() {

+		if(constraintName_6048Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			constraintName_6048Parser = parser;

+		}

+		return constraintName_6048Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private ConstraintParser constraintSpecification_6049Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getConstraintSpecification_6049Parser() {

+		if(constraintSpecification_6049Parser == null) {

+			constraintSpecification_6049Parser = new ConstraintParser();

+		}

+		return constraintSpecification_6049Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser property_3101Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getProperty_3101Parser() {

+		if(property_3101Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			property_3101Parser = parser;

+		}

+		return property_3101Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser operation_3102Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getOperation_3102Parser() {

+		if(operation_3102Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			operation_3102Parser = parser;

+		}

+		return operation_3102Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser enumerationLiteral_3066Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getEnumerationLiteral_3066Parser() {

+		if(enumerationLiteral_3066Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("{0}  "); //$NON-NLS-1$

+			parser.setEditorPattern("{0}"); //$NON-NLS-1$

+			parser.setEditPattern("{0}"); //$NON-NLS-1$

+			enumerationLiteral_3066Parser = parser;

+		}

+		return enumerationLiteral_3066Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser componentRealizationName_6001Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getComponentRealizationName_6001Parser() {

+		if(componentRealizationName_6001Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			componentRealizationName_6001Parser = parser;

+		}

+		return componentRealizationName_6001Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private AppliedStereotypeParser componentRealizationName_6015Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getComponentRealizationName_6015Parser() {

+		if(componentRealizationName_6015Parser == null) {

+			componentRealizationName_6015Parser = new AppliedStereotypeParser();

+		}

+		return componentRealizationName_6015Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser interfaceRealizationName_6002Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getInterfaceRealizationName_6002Parser() {

+		if(interfaceRealizationName_6002Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			interfaceRealizationName_6002Parser = parser;

+		}

+		return interfaceRealizationName_6002Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private AppliedStereotypeParser interfaceRealizationName_6016Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getInterfaceRealizationName_6016Parser() {

+		if(interfaceRealizationName_6016Parser == null) {

+			interfaceRealizationName_6016Parser = new AppliedStereotypeParser();

+		}

+		return interfaceRealizationName_6016Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser substitutionName_6003Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSubstitutionName_6003Parser() {

+		if(substitutionName_6003Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			substitutionName_6003Parser = parser;

+		}

+		return substitutionName_6003Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private AppliedStereotypeParser substitutionName_6017Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getSubstitutionName_6017Parser() {

+		if(substitutionName_6017Parser == null) {

+			substitutionName_6017Parser = new AppliedStereotypeParser();

+		}

+		return substitutionName_6017Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser realizationName_6004Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getRealizationName_6004Parser() {

+		if(realizationName_6004Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			realizationName_6004Parser = parser;

+		}

+		return realizationName_6004Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private AppliedStereotypeParser realizationName_6018Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getRealizationName_6018Parser() {

+		if(realizationName_6018Parser == null) {

+			realizationName_6018Parser = new AppliedStereotypeParser();

+		}

+		return realizationName_6018Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser manifestationName_6005Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getManifestationName_6005Parser() {

+		if(manifestationName_6005Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			manifestationName_6005Parser = parser;

+		}

+		return manifestationName_6005Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private AppliedStereotypeParser manifestationName_6019Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getManifestationName_6019Parser() {

+		if(manifestationName_6019Parser == null) {

+			manifestationName_6019Parser = new AppliedStereotypeParser();

+		}

+		return manifestationName_6019Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser abstractionName_6006Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getAbstractionName_6006Parser() {

+		if(abstractionName_6006Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			abstractionName_6006Parser = parser;

+		}

+		return abstractionName_6006Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private AppliedStereotypeParser abstractionName_6020Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getAbstractionName_6020Parser() {

+		if(abstractionName_6020Parser == null) {

+			abstractionName_6020Parser = new AppliedStereotypeParser();

+		}

+		return abstractionName_6020Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser usageName_6007Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getUsageName_6007Parser() {

+		if(usageName_6007Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			usageName_6007Parser = parser;

+		}

+		return usageName_6007Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private AppliedStereotypeParser usageName_6021Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getUsageName_6021Parser() {

+		if(usageName_6021Parser == null) {

+			usageName_6021Parser = new AppliedStereotypeParser();

+		}

+		return usageName_6021Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser deploymentName_6008Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getDeploymentName_6008Parser() {

+		if(deploymentName_6008Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			deploymentName_6008Parser = parser;

+		}

+		return deploymentName_6008Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private AppliedStereotypeParser deploymentName_6022Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getDeploymentName_6022Parser() {

+		if(deploymentName_6022Parser == null) {

+			deploymentName_6022Parser = new AppliedStereotypeParser();

+		}

+		return deploymentName_6022Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private RoleBindingRoleNameParser dependencyName_6027Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getDependencyName_6027Parser() {

+		if(dependencyName_6027Parser == null) {

+			dependencyName_6027Parser = new RoleBindingRoleNameParser();

+		}

+		return dependencyName_6027Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private AppliedStereotypeParser dependencyName_6028Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getDependencyName_6028Parser() {

+		if(dependencyName_6028Parser == null) {

+			dependencyName_6028Parser = new AppliedStereotypeParser();

+		}

+		return dependencyName_6028Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser dependencyName_6009Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getDependencyName_6009Parser() {

+		if(dependencyName_6009Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			dependencyName_6009Parser = parser;

+		}

+		return dependencyName_6009Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private AppliedStereotypeParser dependencyName_6023Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getDependencyName_6023Parser() {

+		if(dependencyName_6023Parser == null) {

+			dependencyName_6023Parser = new AppliedStereotypeParser();

+		}

+		return dependencyName_6023Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private AppliedStereotypeParser connectorName_6025Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getConnectorName_6025Parser() {

+		if(connectorName_6025Parser == null) {

+			connectorName_6025Parser = new AppliedStereotypeParser();

+		}

+		return connectorName_6025Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser connectorName_6050Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getConnectorName_6050Parser() {

+		if(connectorName_6050Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			connectorName_6050Parser = parser;

+		}

+		return connectorName_6050Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser connectorName_6051Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getConnectorName_6051Parser() {

+		if(connectorName_6051Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("sourceMul{0}"); //$NON-NLS-1$

+			parser.setEditorPattern("sourceMul{0}"); //$NON-NLS-1$

+			parser.setEditPattern("sourceMul{0}"); //$NON-NLS-1$

+			connectorName_6051Parser = parser;

+		}

+		return connectorName_6051Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IParser connectorName_6052Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getConnectorName_6052Parser() {

+		if(connectorName_6052Parser == null) {

+			EAttribute[] features = new EAttribute[]{ UMLPackage.eINSTANCE.getNamedElement_Name() };

+			MessageFormatParser parser = new MessageFormatParser(features);

+			parser.setViewPattern("targetMul{0}"); //$NON-NLS-1$

+			parser.setEditorPattern("targetMul{0}"); //$NON-NLS-1$

+			parser.setEditPattern("targetMul{0}"); //$NON-NLS-1$

+			connectorName_6052Parser = parser;

+		}

+		return connectorName_6052Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private AppliedStereotypeParser generalizationIsSubstitutable_6024Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getGeneralizationIsSubstitutable_6024Parser() {

+		if(generalizationIsSubstitutable_6024Parser == null) {

+			generalizationIsSubstitutable_6024Parser = new AppliedStereotypeParser();

+		}

+		return generalizationIsSubstitutable_6024Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	private AppliedStereotypeParser informationFlowName_6032Parser;

+

+	/**

+	 * @generated

+	 */

+	private IParser getInformationFlowName_6032Parser() {

+		if(informationFlowName_6032Parser == null) {

+			informationFlowName_6032Parser = new AppliedStereotypeParser();

+		}

+		return informationFlowName_6032Parser;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IParser getParser(int visualID) {

+		switch(visualID) {

+		case ActivityCompositeNameEditPart.VISUAL_ID:

+			return getActivityName_5112Parser();

+

+		case InteractionCompositeNameEditPart.VISUAL_ID:

+			return getInteractionName_5113Parser();

+

+		case ProtocolStateMachineCompositeNameEditPart.VISUAL_ID:

+			return getProtocolStateMachineName_5114Parser();

+

+		case StateMachineCompositeNameEditPart.VISUAL_ID:

+			return getStateMachineName_5115Parser();

+

+		case FunctionBehaviorCompositeNameEditPart.VISUAL_ID:

+			return getFunctionBehaviorName_5116Parser();

+

+		case OpaqueBehaviorCompositeNameEditPart.VISUAL_ID:

+			return getOpaqueBehaviorName_5117Parser();

+

+		case ComponentCompositeNameEditPart.VISUAL_ID:

+			return getComponentName_5121Parser();

+

+		case DeviceCompositeNameEditPart.VISUAL_ID:

+			return getDeviceName_5122Parser();

+

+		case ExecutionEnvironmentCompositeNameEditPart.VISUAL_ID:

+			return getExecutionEnvironmentName_5123Parser();

+

+		case NodeCompositeNameEditPart.VISUAL_ID:

+			return getNodeName_5124Parser();

+

+		case ClassCompositeNameEditPart.VISUAL_ID:

+			return getClassName_5156Parser();

+

+		case CollaborationCompositeNameEditPart.VISUAL_ID:

+			return getCollaborationName_5158Parser();

+

+		case InterfaceNameEditPart.VISUAL_ID:

+			return getInterfaceName_5159Parser();

+

+		case PrimitiveTypeNameEditPart.VISUAL_ID:

+			return getPrimitiveTypeName_5118Parser();

+

+		case EnumerationNameEditPart.VISUAL_ID:

+			return getEnumerationName_5119Parser();

+

+		case DataTypeNameEditPart.VISUAL_ID:

+			return getDataTypeName_5120Parser();

+

+		case ActorNameEditPart.VISUAL_ID:

+			return getActorName_5160Parser();

+

+		case DeploymentSpecificationNameEditPart.VISUAL_ID:

+			return getDeploymentSpecificationName_5161Parser();

+

+		case ArtifactNameEditPart.VISUAL_ID:

+			return getArtifactName_5162Parser();

+

+		case InformationItemNameEditPart.VISUAL_ID:

+			return getInformationItemName_5163Parser();

+

+		case SignalNameEditPart.VISUAL_ID:

+			return getSignalName_5164Parser();

+

+		case UseCaseNameEditPart.VISUAL_ID:

+			return getUseCaseName_5165Parser();

+

+		case SignalEventNameEditPart.VISUAL_ID:

+			return getSignalEventName_5166Parser();

+

+		case CallEventNameEditPart.VISUAL_ID:

+			return getCallEventName_5167Parser();

+

+		case AnyReceiveEventNameEditPart.VISUAL_ID:

+			return getAnyReceiveEventName_5168Parser();

+

+		case ChangeEventNameEditPart.VISUAL_ID:

+			return getChangeEventName_5171Parser();

+

+		case TimeEventNameEditPart.VISUAL_ID:

+			return getTimeEventName_5172Parser();

+

+		case DurationObservationNameEditPart.VISUAL_ID:

+			return getDurationObservationName_5151Parser();

+		case DurationObservationStereotypeLabelEditPart.VISUAL_ID:

+			return getDurationObservationName_5152Parser();

+

+		case TimeObservationNameEditPart.VISUAL_ID:

+			return getTimeObservationName_5142Parser();

+		case TimeObservationStereotypeLabelEditPart.VISUAL_ID:

+			return getTimeObservationName_5143Parser();

+

+		case LiteralBooleanNameEditPart.VISUAL_ID:

+			return getLiteralBooleanName_5178Parser();

+

+		case LiteralIntegerNameEditPart.VISUAL_ID:

+			return getLiteralIntegerName_5179Parser();

+

+		case LiteralNullNameEditPart.VISUAL_ID:

+			return getLiteralNullName_5180Parser();

+

+		case LiteralStringNameEditPart.VISUAL_ID:

+			return getLiteralStringName_5181Parser();

+

+		case LiteralUnlimitedNaturalNameEditPart.VISUAL_ID:

+			return getLiteralUnlimitedNaturalName_5182Parser();

+

+		case StringExpressionNameEditPart.VISUAL_ID:

+			return getStringExpressionName_5183Parser();

+

+		case OpaqueExpressionNameEditPart.VISUAL_ID:

+			return getOpaqueExpressionName_5184Parser();

+

+		case TimeExpressionNameEditPart.VISUAL_ID:

+			return getTimeExpressionName_5185Parser();

+

+		case ExpressionNameEditPart.VISUAL_ID:

+			return getExpressionName_5186Parser();

+

+		case DurationNameEditPart.VISUAL_ID:

+			return getDurationName_5187Parser();

+

+		case TimeIntervalNameEditPart.VISUAL_ID:

+			return getTimeIntervalName_5188Parser();

+

+		case DurationIntervalNameEditPart.VISUAL_ID:

+			return getDurationIntervalName_5189Parser();

+

+		case IntervalNameEditPart.VISUAL_ID:

+			return getIntervalName_5190Parser();

+

+		case InstanceValueNameEditPart.VISUAL_ID:

+			return getInstanceValueName_5191Parser();

+

+		case CommentBodyEditPart.VISUAL_ID:

+			return getCommentBody_5192Parser();

+

+		case DurationConstraintNameEditPart.VISUAL_ID:

+			return getDurationConstraintName_5193Parser();

+		case DurationConstraintSpecificationEditPart.VISUAL_ID:

+			return getDurationConstraintSpecification_6035Parser();

+

+		case TimeConstraintNameEditPart.VISUAL_ID:

+			return getTimeConstraintName_5194Parser();

+		case TimeConstraintSpecificationEditPart.VISUAL_ID:

+			return getTimeConstraintSpecification_6036Parser();

+

+		case IntervalConstraintNameEditPart.VISUAL_ID:

+			return getIntervalConstraintName_5195Parser();

+		case IntervalConstraintSpecificationEditPart.VISUAL_ID:

+			return getIntervalConstraintSpecification_6037Parser();

+

+		case InteractionConstraintNameEditPart.VISUAL_ID:

+			return getInteractionConstraintName_5196Parser();

+		case InteractionConstraintSpecificationEditPart.VISUAL_ID:

+			return getInteractionConstraintSpecification_6038Parser();

+

+		case ConstraintNameEditPart.VISUAL_ID:

+			return getConstraintName_5197Parser();

+		case ConstraintSpecificationEditPart.VISUAL_ID:

+			return getConstraintSpecification_6039Parser();

+

+

+		case PortNameEditPart.VISUAL_ID:

+			return getPortName_5125Parser();

+		case PortAppliedStereotypeEditPart.VISUAL_ID:

+			return getPortName_6029Parser();

+

+		case ParameterNameEditPart.VISUAL_ID:

+			return getParameterName_6033Parser();

+		case ParameterAppliedStereotypeEditPart.VISUAL_ID:

+			return getParameterName_6034Parser();

+

+		case PropertyPartNameEditPartCN.VISUAL_ID:

+			return getPropertyName_5126Parser();

+

+		case CollaborationRoleNameEditPartCN.VISUAL_ID:

+			return getConnectableElementName_5198Parser();

+

+		case CollaborationUseNameEditPart.VISUAL_ID:

+			return getCollaborationUseName_5127Parser();

+

+		case ActivityCompositeNameEditPartCN.VISUAL_ID:

+			return getActivityName_5128Parser();

+

+		case InteractionCompositeNameEditPartCN.VISUAL_ID:

+			return getInteractionName_5129Parser();

+

+		case ProtocolStateMachineCompositeNameEditPartCN.VISUAL_ID:

+			return getProtocolStateMachineName_5130Parser();

+

+		case StateMachineCompositeNameEditPartCN.VISUAL_ID:

+			return getStateMachineName_5131Parser();

+

+		case FunctionBehaviorCompositeNameEditPartCN.VISUAL_ID:

+			return getFunctionBehaviorName_5132Parser();

+

+		case OpaqueBehaviorCompositeNameEditPartCN.VISUAL_ID:

+			return getOpaqueBehaviorName_5133Parser();

+

+		case ComponentCompositeNameEditPartCN.VISUAL_ID:

+			return getComponentName_5137Parser();

+

+		case DeviceCompositeNameEditPartCN.VISUAL_ID:

+			return getDeviceName_5138Parser();

+

+		case ExecutionEnvironmentCompositeNameEditPartCN.VISUAL_ID:

+			return getExecutionEnvironmentName_5139Parser();

+

+		case NodeCompositeNameEditPartCN.VISUAL_ID:

+			return getNodeName_5140Parser();

+

+		case ClassCompositeNameEditPartCN.VISUAL_ID:

+			return getClassName_5155Parser();

+

+		case CollaborationCompositeNameEditPartCN.VISUAL_ID:

+			return getCollaborationName_5141Parser();

+

+		case InterfaceNameEditPartCN.VISUAL_ID:

+			return getInterfaceName_5154Parser();

+

+		case PrimitiveTypeNameEditPartCN.VISUAL_ID:

+			return getPrimitiveTypeName_5134Parser();

+

+		case EnumerationNameEditPartCN.VISUAL_ID:

+			return getEnumerationName_5135Parser();

+

+		case DataTypeNameEditPartCN.VISUAL_ID:

+			return getDataTypeName_5136Parser();

+

+		case ActorNameEditPartCN.VISUAL_ID:

+			return getActorName_5144Parser();

+

+		case DeploymentSpecificationNameEditPartCN.VISUAL_ID:

+			return getDeploymentSpecificationName_5145Parser();

+

+		case ArtifactNameEditPartCN.VISUAL_ID:

+			return getArtifactName_5146Parser();

+

+		case InformationItemNameEditPartCN.VISUAL_ID:

+			return getInformationItemName_5147Parser();

+

+		case SignalNameEditPartCN.VISUAL_ID:

+			return getSignalName_5148Parser();

+

+		case UseCaseNameEditPartCN.VISUAL_ID:

+			return getUseCaseName_5149Parser();

+

+		case CommentBodyEditPartCN.VISUAL_ID:

+			return getCommentBody_5150Parser();

+

+		case DurationConstraintNameEditPartCN.VISUAL_ID:

+			return getDurationConstraintName_6040Parser();

+		case DurationConstraintSpecificationEditPartCN.VISUAL_ID:

+			return getDurationConstraintSpecification_6041Parser();

+

+		case TimeConstraintNameEditPartCN.VISUAL_ID:

+			return getTimeConstraintName_6042Parser();

+		case TimeConstraintSpecificationEditPartCN.VISUAL_ID:

+			return getTimeConstraintSpecification_6043Parser();

+

+		case IntervalConstraintNameEditPartCN.VISUAL_ID:

+			return getIntervalConstraintName_6044Parser();

+		case IntervalConstraintSpecificationEditPartCN.VISUAL_ID:

+			return getIntervalConstraintSpecification_6045Parser();

+

+		case InteractionConstraintNameEditPartCN.VISUAL_ID:

+			return getInteractionConstraintName_6046Parser();

+		case InteractionConstraintSpecificationEditPartCN.VISUAL_ID:

+			return getInteractionConstraintSpecification_6047Parser();

+

+		case ConstraintNameEditPartCN.VISUAL_ID:

+			return getConstraintName_6048Parser();

+		case ConstraintSpecificationEditPartCN.VISUAL_ID:

+			return getConstraintSpecification_6049Parser();

+

+		case PropertyEditPartCLN.VISUAL_ID:

+			return getProperty_3101Parser();

+		case OperationEditPartCLN.VISUAL_ID:

+			return getOperation_3102Parser();

+		case EnumerationLiteralEditPartCLN.VISUAL_ID:

+			return getEnumerationLiteral_3066Parser();

+

+

+

+

+		case ComponentRealizationNameEditPart.VISUAL_ID:

+			return getComponentRealizationName_6001Parser();

+		case ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID:

+			return getComponentRealizationName_6015Parser();

+

+		case InterfaceRealizationNameEditPart.VISUAL_ID:

+			return getInterfaceRealizationName_6002Parser();

+		case InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID:

+			return getInterfaceRealizationName_6016Parser();

+

+		case SubstitutionNameEditPart.VISUAL_ID:

+			return getSubstitutionName_6003Parser();

+		case SubstitutionAppliedStereotypeEditPart.VISUAL_ID:

+			return getSubstitutionName_6017Parser();

+

+		case RealizationNameEditPart.VISUAL_ID:

+			return getRealizationName_6004Parser();

+		case RealizationAppliedStereotypeEditPart.VISUAL_ID:

+			return getRealizationName_6018Parser();

+

+		case ManifestationNameEditPart.VISUAL_ID:

+			return getManifestationName_6005Parser();

+		case ManifestationAppliedStereotypeEditPart.VISUAL_ID:

+			return getManifestationName_6019Parser();

+

+		case AbstractionNameEditPart.VISUAL_ID:

+			return getAbstractionName_6006Parser();

+		case AbstractionAppliedStereotypeEditPart.VISUAL_ID:

+			return getAbstractionName_6020Parser();

+

+		case UsageNameEditPart.VISUAL_ID:

+			return getUsageName_6007Parser();

+		case UsageAppliedStereotypeEditPart.VISUAL_ID:

+			return getUsageName_6021Parser();

+

+		case DeploymentNameEditPart.VISUAL_ID:

+			return getDeploymentName_6008Parser();

+		case DeploymentAppliedStereotypeEditPart.VISUAL_ID:

+			return getDeploymentName_6022Parser();

+

+		case RoleBindingRoleNameEditPart.VISUAL_ID:

+			return getDependencyName_6027Parser();

+		case RoleBindingAppliedStereotypeEditPart.VISUAL_ID:

+			return getDependencyName_6028Parser();

+

+		case DependencyNameEditPart.VISUAL_ID:

+			return getDependencyName_6009Parser();

+		case DependencyAppliedStereotypeEditPart.VISUAL_ID:

+			return getDependencyName_6023Parser();

+

+		case ConnectorAppliedStereotypeEditPart.VISUAL_ID:

+			return getConnectorName_6025Parser();

+		case ConnectorNameEditPart.VISUAL_ID:

+			return getConnectorName_6050Parser();

+		case ConnectorMultiplicitySourceEditPart.VISUAL_ID:

+			return getConnectorName_6051Parser();

+		case ConnectorMultiplicityTargetEditPart.VISUAL_ID:

+			return getConnectorName_6052Parser();

+

+		case GeneralizationAppliedStereotypeEditPart.VISUAL_ID:

+			return getGeneralizationIsSubstitutable_6024Parser();

+

+

+

+

+		case InformationFlowAppliedStereotypeEditPart.VISUAL_ID:

+			return getInformationFlowName_6032Parser();

+

+		}

+		return null;

+	}

+

+	/**

+	 * Utility method that consults ParserService

+	 * 

+	 * @generated

+	 */

+	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) {

+			return getParser(UMLVisualIDRegistry.getVisualID(vid));

+		}

+		View view = (View)hint.getAdapter(View.class);

+		if(view != null) {

+			return getParser(UMLVisualIDRegistry.getVisualID(view));

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean provides(IOperation operation) {

+		if(operation instanceof GetParserOperation) {

+			IAdaptable hint = ((GetParserOperation)operation).getHint();

+			if(UMLElementTypes.getElement(hint) == null) {

+				return false;

+			}

+			return getParser(hint) != null;

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	private static class HintAdapter extends ParserHintAdapter {

+

+		/**

+		 * @generated

+		 */

+		private final IElementType elementType;

+

+		/**

+		 * @generated

+		 */

+		public HintAdapter(IElementType type, EObject object, String parserHint) {

+			super(object, parserHint);

+			assert type != null;

+			elementType = type;

+		}

+

+		/**

+		 * @generated

+		 */

+		public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {

+			if(IElementType.class.equals(adapter)) {

+				return elementType;

+			}

+			return super.getAdapter(adapter);

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationDecoratorProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationDecoratorProvider.java
index 91a7fe8b271..a941cce9379 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationDecoratorProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationDecoratorProvider.java
@@ -1,73 +1,69 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.providers;
-
-import org.eclipse.gef.EditDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.editparts.AbstractConnectionEditPart;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditDomain;
-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.CreateDecoratorsOperation;
-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorProvider;
-import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.common.providers.ValidationDecoratorProvider;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditor;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-
-/**
- * @generated
- */
-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) {
-			Object model = editPart.getModel();
-			if ((model instanceof View)) {
-				View view = (View) model;
-				if (!(view instanceof Edge) && !view.isSetElement()) {
-					return;
-				}
-			}
-			EditDomain ed = editPart.getViewer().getEditDomain();
-			if (!(ed instanceof DiagramEditDomain)) {
-				return;
-			}
-			if (((DiagramEditDomain) ed).getEditorPart() instanceof UMLDiagramEditor) {
-				decoratorTarget.installDecorator(KEY, new StatusDecorator(decoratorTarget));
-			}
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean provides(IOperation operation) {
-		if (!(operation instanceof CreateDecoratorsOperation)) {
-			return false;
-		}
-		IDecoratorTarget decoratorTarget =
-				((CreateDecoratorsOperation) operation).getDecoratorTarget();
-		View view = (View) decoratorTarget.getAdapter(
-				View.class);
-		return view != null && CompositeStructureDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(view));
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.providers;

+

+import org.eclipse.gef.EditDomain;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.editparts.AbstractConnectionEditPart;

+import org.eclipse.gmf.runtime.common.core.service.IOperation;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditDomain;

+import org.eclipse.gmf.runtime.diagram.ui.services.decorator.CreateDecoratorsOperation;

+import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorProvider;

+import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.common.providers.ValidationDecoratorProvider;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditor;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+

+/**

+ * @generated

+ */

+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) {

+			Object model = editPart.getModel();

+			if((model instanceof View)) {

+				View view = (View)model;

+				if(!(view instanceof Edge) && !view.isSetElement()) {

+					return;

+				}

+			}

+			EditDomain ed = editPart.getViewer().getEditDomain();

+			if(!(ed instanceof DiagramEditDomain)) {

+				return;

+			}

+			if(((DiagramEditDomain)ed).getEditorPart() instanceof UMLDiagramEditor) {

+				decoratorTarget.installDecorator(KEY, new StatusDecorator(decoratorTarget));

+			}

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	public boolean provides(IOperation operation) {

+		if(!(operation instanceof CreateDecoratorsOperation)) {

+			return false;

+		}

+		IDecoratorTarget decoratorTarget = ((CreateDecoratorsOperation)operation).getDecoratorTarget();

+		View view = (View)decoratorTarget.getAdapter(View.class);

+		return view != null && CompositeStructureDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(view));

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationProvider.java
index 820815d2cb0..9543679aded 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLValidationProvider.java
@@ -1,74 +1,76 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.providers;
-
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-
-/**
- * @generated
- */
-public class UMLValidationProvider {
-	/**
-	 * @generated
-	 */
-	private static boolean constraintsActive = false;
-
-	/**
-	 * @generated
-	 */
-	public static boolean shouldConstraintsBePrivate() {
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	public static void runWithConstraints(TransactionalEditingDomain editingDomain, Runnable operation) {
-		final Runnable op = operation;
-		Runnable task = new Runnable() {
-			public void run() {
-				try {
-					constraintsActive = true;
-					op.run();
-				} finally {
-					constraintsActive = false;
-				}
-			}
-		};
-		if (editingDomain != null) {
-			try {
-				editingDomain.runExclusive(task);
-			} catch (Exception e) {
-				UMLDiagramEditorPlugin.getInstance().logError("Validation failed", e); //$NON-NLS-1$
-			}
-		} else {
-			task.run();
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	static boolean isInDefaultEditorContext(Object object) {
-		if (shouldConstraintsBePrivate() && !constraintsActive) {
-			return false;
-		}
-		if (object instanceof View) {
-			return constraintsActive && CompositeStructureDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID((View) object));
-		}
-		return true;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.providers;

+

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.CompositeStructureDiagramEditPart;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+

+/**

+ * @generated

+ */

+public class UMLValidationProvider {

+

+	/**

+	 * @generated

+	 */

+	private static boolean constraintsActive = false;

+

+	/**

+	 * @generated

+	 */

+	public static boolean shouldConstraintsBePrivate() {

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	public static void runWithConstraints(TransactionalEditingDomain editingDomain, Runnable operation) {

+		final Runnable op = operation;

+		Runnable task = new Runnable() {

+

+			public void run() {

+				try {

+					constraintsActive = true;

+					op.run();

+				} finally {

+					constraintsActive = false;

+				}

+			}

+		};

+		if(editingDomain != null) {

+			try {

+				editingDomain.runExclusive(task);

+			} catch (Exception e) {

+				UMLDiagramEditorPlugin.getInstance().logError("Validation failed", e); //$NON-NLS-1$

+			}

+		} else {

+			task.run();

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	static boolean isInDefaultEditorContext(Object object) {

+		if(shouldConstraintsBePrivate() && !constraintsActive) {

+			return false;

+		}

+		if(object instanceof View) {

+			return constraintsActive && CompositeStructureDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID((View)object));

+		}

+		return true;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLViewProvider.java
index 4cca356f073..f52afa85303 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/providers/UMLViewProvider.java
@@ -1,2949 +1,2982 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.providers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
-import org.eclipse.gmf.runtime.common.core.service.IOperation;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.providers.IViewProvider;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateEdgeViewOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateNodeViewOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewForKindOperation;
-import org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewOperation;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
-import org.eclipse.gmf.runtime.notation.Connector;
-import org.eclipse.gmf.runtime.notation.DecorationNode;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.FillStyle;
-import org.eclipse.gmf.runtime.notation.FontStyle;
-import org.eclipse.gmf.runtime.notation.Location;
-import org.eclipse.gmf.runtime.notation.MeasurementUnit;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.gmf.runtime.notation.NotationFactory;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.gmf.runtime.notation.RelativeBendpoints;
-import org.eclipse.gmf.runtime.notation.Shape;
-import org.eclipse.gmf.runtime.notation.TitleStyle;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;
-import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;
-import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;
-import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;
-import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;
-import org.eclipse.papyrus.uml.diagram.composite.edit.parts.*;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.FontData;
-
-/**
- * @generated
- */
-public class UMLViewProvider extends AbstractProvider implements IViewProvider {
-	/**
-	 * @generated
-	 */
-	public final boolean provides(IOperation 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);
-		}
-		return false;
-	}
-
-	/**
-	 * @generated
-	 */
-	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;
-		 */
-		// check Diagram Type should be the class diagram
-		String modelID = UMLVisualIDRegistry.getModelID(op.getContainerView());
-		if (!getDiagramProvidedId().equals(modelID)) {
-			return false;
-		}
-		int visualID = UMLVisualIDRegistry.getVisualID(op.getSemanticHint());
-		if (Node.class.isAssignableFrom(op.getViewKind())) {
-			return UMLVisualIDRegistry.canCreateNode(op.getContainerView(), visualID);
-		}
-		return true;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected String getDiagramProvidedId() {
-		/*
-		 * Indicates for which diagram this provider works for.
-		 * <p>
-		 * This method can be overloaded when diagram editor inherits from another one, but should never be <code>null</code>
-		 * </p>
-		 * 
-		 * @return the unique identifier of the diagram for which views are provided.
-		 */
-		return CompositeStructureDiagramEditPart.MODEL_ID;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean provides(CreateDiagramViewOperation op) {
-		return CompositeStructureDiagramEditPart.MODEL_ID.equals(op.getSemanticHint()) && UMLVisualIDRegistry.getDiagramVisualID(getSemanticElement(op.getSemanticAdapter())) != -1;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean provides(CreateNodeViewOperation op) {
-		if (op.getContainerView() == null) {
-			return false;
-		}
-		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		EObject domainElement = getSemanticElement(op.getSemanticAdapter());
-		int visualID;
-		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) {
-				return false;
-			}
-			visualID = UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement);
-		} else {
-			visualID = UMLVisualIDRegistry.getVisualID(op.getSemanticHint());
-			if (elementType != null) {
-				if (elementType instanceof IExtendedHintedElementType) {
-					if (domainElement != null) {
-						if (!UMLVisualIDRegistry.checkNodeVisualID(op.getContainerView(), domainElement, visualID)) {
-							return false;
-						}
-					}
-				} else {
-					if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {
-						return false; // foreign element type
-					}
-				}
-				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)) {
-					return false; // visual id for node EClass should match visual id from element type
-				}
-			} else {
-				if (!CompositeStructureDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(op.getContainerView()))) {
-					return false; // foreign diagram
-				}
-				switch (visualID) {
-				case BehaviorPortEditPart.VISUAL_ID:
-					break; // pure design element
-				case ActivityCompositeEditPart.VISUAL_ID:
-				case InteractionCompositeEditPart.VISUAL_ID:
-				case ProtocolStateMachineCompositeEditPart.VISUAL_ID:
-				case StateMachineCompositeEditPart.VISUAL_ID:
-				case FunctionBehaviorCompositeEditPart.VISUAL_ID:
-				case OpaqueBehaviorCompositeEditPart.VISUAL_ID:
-				case ComponentCompositeEditPart.VISUAL_ID:
-				case DeviceCompositeEditPart.VISUAL_ID:
-				case ExecutionEnvironmentCompositeEditPart.VISUAL_ID:
-				case NodeCompositeEditPart.VISUAL_ID:
-				case ClassCompositeEditPart.VISUAL_ID:
-				case PrimitiveTypeEditPart.VISUAL_ID:
-				case EnumerationEditPart.VISUAL_ID:
-				case DataTypeEditPart.VISUAL_ID:
-				case SignalEventEditPart.VISUAL_ID:
-				case CallEventEditPart.VISUAL_ID:
-				case AnyReceiveEventEditPart.VISUAL_ID:
-				case ChangeEventEditPart.VISUAL_ID:
-				case TimeEventEditPart.VISUAL_ID:
-				case DurationObservationEditPart.VISUAL_ID:
-				case TimeObservationEditPart.VISUAL_ID:
-				case LiteralBooleanEditPart.VISUAL_ID:
-				case LiteralIntegerEditPart.VISUAL_ID:
-				case LiteralNullEditPart.VISUAL_ID:
-				case LiteralStringEditPart.VISUAL_ID:
-				case LiteralUnlimitedNaturalEditPart.VISUAL_ID:
-				case StringExpressionEditPart.VISUAL_ID:
-				case OpaqueExpressionEditPart.VISUAL_ID:
-				case TimeExpressionEditPart.VISUAL_ID:
-				case ExpressionEditPart.VISUAL_ID:
-				case DurationEditPart.VISUAL_ID:
-				case TimeIntervalEditPart.VISUAL_ID:
-				case DurationIntervalEditPart.VISUAL_ID:
-				case IntervalEditPart.VISUAL_ID:
-				case InstanceValueEditPart.VISUAL_ID:
-				case TimeConstraintEditPart.VISUAL_ID:
-				case IntervalConstraintEditPart.VISUAL_ID:
-				case InteractionConstraintEditPart.VISUAL_ID:
-				case ConstraintEditPart.VISUAL_ID:
-				case PortEditPart.VISUAL_ID:
-				case ParameterEditPart.VISUAL_ID:
-				case PropertyPartEditPartCN.VISUAL_ID:
-				case CollaborationRoleEditPartCN.VISUAL_ID:
-				case CollaborationUseEditPartCN.VISUAL_ID:
-				case CollaborationCompositeEditPartCN.VISUAL_ID:
-				case InterfaceEditPartCN.VISUAL_ID:
-				case ActorEditPartCN.VISUAL_ID:
-				case DeploymentSpecificationEditPartCN.VISUAL_ID:
-				case ArtifactEditPartCN.VISUAL_ID:
-				case InformationItemEditPartCN.VISUAL_ID:
-				case SignalEditPartCN.VISUAL_ID:
-				case UseCaseEditPartCN.VISUAL_ID:
-				case CommentEditPartCN.VISUAL_ID:
-				case EnumerationLiteralEditPartCLN.VISUAL_ID:
-				case CollaborationCompositeEditPart.VISUAL_ID:
-				case InterfaceEditPart.VISUAL_ID:
-				case ActorEditPart.VISUAL_ID:
-				case DeploymentSpecificationEditPart.VISUAL_ID:
-				case ArtifactEditPart.VISUAL_ID:
-				case InformationItemEditPart.VISUAL_ID:
-				case SignalEditPart.VISUAL_ID:
-				case UseCaseEditPart.VISUAL_ID:
-				case CommentEditPart.VISUAL_ID:
-				case DurationConstraintEditPart.VISUAL_ID:
-				case ActivityCompositeEditPartCN.VISUAL_ID:
-				case InteractionCompositeEditPartCN.VISUAL_ID:
-				case ProtocolStateMachineCompositeEditPartCN.VISUAL_ID:
-				case StateMachineCompositeEditPartCN.VISUAL_ID:
-				case FunctionBehaviorCompositeEditPartCN.VISUAL_ID:
-				case OpaqueBehaviorCompositeEditPartCN.VISUAL_ID:
-				case ComponentCompositeEditPartCN.VISUAL_ID:
-				case DeviceCompositeEditPartCN.VISUAL_ID:
-				case ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID:
-				case NodeCompositeEditPartCN.VISUAL_ID:
-				case ClassCompositeEditPartCN.VISUAL_ID:
-				case PrimitiveTypeEditPartCN.VISUAL_ID:
-				case EnumerationEditPartCN.VISUAL_ID:
-				case DataTypeEditPartCN.VISUAL_ID:
-				case DurationConstraintEditPartCN.VISUAL_ID:
-				case TimeConstraintEditPartCN.VISUAL_ID:
-				case IntervalConstraintEditPartCN.VISUAL_ID:
-				case InteractionConstraintEditPartCN.VISUAL_ID:
-				case ConstraintEditPartCN.VISUAL_ID:
-				case PropertyEditPartCLN.VISUAL_ID:
-				case OperationEditPartCLN.VISUAL_ID:
-					if (domainElement == null || visualID != UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement)) {
-						return false; // visual id in semantic hint should match visual id for domain element
-					}
-					break;
-				default:
-					return false;
-				}
-			}
-		}
-		return ActivityCompositeEditPart.VISUAL_ID == visualID || InteractionCompositeEditPart.VISUAL_ID == visualID || ProtocolStateMachineCompositeEditPart.VISUAL_ID == visualID || StateMachineCompositeEditPart.VISUAL_ID == visualID
-				|| FunctionBehaviorCompositeEditPart.VISUAL_ID == visualID || OpaqueBehaviorCompositeEditPart.VISUAL_ID == visualID || ComponentCompositeEditPart.VISUAL_ID == visualID || DeviceCompositeEditPart.VISUAL_ID == visualID
-				|| ExecutionEnvironmentCompositeEditPart.VISUAL_ID == visualID || NodeCompositeEditPart.VISUAL_ID == visualID || ClassCompositeEditPart.VISUAL_ID == visualID || CollaborationCompositeEditPart.VISUAL_ID == visualID
-				|| InterfaceEditPart.VISUAL_ID == visualID || PrimitiveTypeEditPart.VISUAL_ID == visualID || EnumerationEditPart.VISUAL_ID == visualID || DataTypeEditPart.VISUAL_ID == visualID || ActorEditPart.VISUAL_ID == visualID
-				|| DeploymentSpecificationEditPart.VISUAL_ID == visualID || ArtifactEditPart.VISUAL_ID == visualID || InformationItemEditPart.VISUAL_ID == visualID || SignalEditPart.VISUAL_ID == visualID || UseCaseEditPart.VISUAL_ID == visualID
-				|| SignalEventEditPart.VISUAL_ID == visualID || CallEventEditPart.VISUAL_ID == visualID || AnyReceiveEventEditPart.VISUAL_ID == visualID || ChangeEventEditPart.VISUAL_ID == visualID || TimeEventEditPart.VISUAL_ID == visualID
-				|| DurationObservationEditPart.VISUAL_ID == visualID || TimeObservationEditPart.VISUAL_ID == visualID || LiteralBooleanEditPart.VISUAL_ID == visualID || LiteralIntegerEditPart.VISUAL_ID == visualID || LiteralNullEditPart.VISUAL_ID == visualID
-				|| LiteralStringEditPart.VISUAL_ID == visualID || LiteralUnlimitedNaturalEditPart.VISUAL_ID == visualID || StringExpressionEditPart.VISUAL_ID == visualID || OpaqueExpressionEditPart.VISUAL_ID == visualID
-				|| TimeExpressionEditPart.VISUAL_ID == visualID || ExpressionEditPart.VISUAL_ID == visualID || DurationEditPart.VISUAL_ID == visualID || TimeIntervalEditPart.VISUAL_ID == visualID || DurationIntervalEditPart.VISUAL_ID == visualID
-				|| IntervalEditPart.VISUAL_ID == visualID || InstanceValueEditPart.VISUAL_ID == visualID || CommentEditPart.VISUAL_ID == visualID || DurationConstraintEditPart.VISUAL_ID == visualID || TimeConstraintEditPart.VISUAL_ID == visualID
-				|| IntervalConstraintEditPart.VISUAL_ID == visualID || InteractionConstraintEditPart.VISUAL_ID == visualID || ConstraintEditPart.VISUAL_ID == visualID || BehaviorPortEditPart.VISUAL_ID == visualID || PortEditPart.VISUAL_ID == visualID
-				|| ParameterEditPart.VISUAL_ID == visualID || PropertyPartEditPartCN.VISUAL_ID == visualID || CollaborationRoleEditPartCN.VISUAL_ID == visualID || CollaborationUseEditPartCN.VISUAL_ID == visualID
-				|| ActivityCompositeEditPartCN.VISUAL_ID == visualID || InteractionCompositeEditPartCN.VISUAL_ID == visualID || ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == visualID || StateMachineCompositeEditPartCN.VISUAL_ID == visualID
-				|| FunctionBehaviorCompositeEditPartCN.VISUAL_ID == visualID || OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == visualID || ComponentCompositeEditPartCN.VISUAL_ID == visualID || DeviceCompositeEditPartCN.VISUAL_ID == visualID
-				|| ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == visualID || NodeCompositeEditPartCN.VISUAL_ID == visualID || ClassCompositeEditPartCN.VISUAL_ID == visualID || CollaborationCompositeEditPartCN.VISUAL_ID == visualID
-				|| InterfaceEditPartCN.VISUAL_ID == visualID || PrimitiveTypeEditPartCN.VISUAL_ID == visualID || EnumerationEditPartCN.VISUAL_ID == visualID || DataTypeEditPartCN.VISUAL_ID == visualID || ActorEditPartCN.VISUAL_ID == visualID
-				|| DeploymentSpecificationEditPartCN.VISUAL_ID == visualID || ArtifactEditPartCN.VISUAL_ID == visualID || InformationItemEditPartCN.VISUAL_ID == visualID || SignalEditPartCN.VISUAL_ID == visualID || UseCaseEditPartCN.VISUAL_ID == visualID
-				|| CommentEditPartCN.VISUAL_ID == visualID || DurationConstraintEditPartCN.VISUAL_ID == visualID || TimeConstraintEditPartCN.VISUAL_ID == visualID || IntervalConstraintEditPartCN.VISUAL_ID == visualID
-				|| InteractionConstraintEditPartCN.VISUAL_ID == visualID || ConstraintEditPartCN.VISUAL_ID == visualID || PropertyEditPartCLN.VISUAL_ID == visualID || OperationEditPartCLN.VISUAL_ID == visualID
-				|| EnumerationLiteralEditPartCLN.VISUAL_ID == visualID;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected boolean provides(CreateEdgeViewOperation op) {
-		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		//RS: add code for extended types creation
-		if (elementType instanceof IExtendedHintedElementType) {
-			IElementType closestNonExtendedType = ElementTypeUtils.getClosestDiagramType(elementType);
-			if (!UMLElementTypes.isKnownElementType(closestNonExtendedType) || (!(closestNonExtendedType instanceof IHintedType))) {
-				return false; // foreign element type.
-			}
-		} else {
-			if (!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {
-				return false; // foreign element type
-			}
-		}
-		//if (!org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof org.eclipse.gmf.runtime.emf.type.core.IHintedType))) {
-		//	return false; // foreign element type
-		//}
-		// END R.S.
-		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)) {
-			return false; // visual id for link EClass should match visual id from element type
-		}
-		return true;
-	}
-
-	/**
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	public Diagram createDiagram(IAdaptable semanticAdapter, String diagramKind, PreferencesHint preferencesHint) {
-		Diagram diagram = NotationFactory.eINSTANCE.createDiagram();
-		diagram.getStyles().add(NotationFactory.eINSTANCE.createDiagramStyle());
-		diagram.setType(CompositeStructureDiagramEditPart.MODEL_ID);
-		diagram.setElement(getSemanticElement(semanticAdapter));
-		diagram.setMeasurementUnit(MeasurementUnit.PIXEL_LITERAL);
-		return diagram;
-	}
-
-	/**
-	 * @generated
-	 */
-	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);
-		} else {
-			visualID = UMLVisualIDRegistry.getVisualID(semanticHint);
-		}
-		switch (visualID) {
-		case ActivityCompositeEditPart.VISUAL_ID:
-			return createActivity_2060(domainElement, containerView, index, persisted, preferencesHint);
-		case InteractionCompositeEditPart.VISUAL_ID:
-			return createInteraction_2061(domainElement, containerView, index, persisted, preferencesHint);
-		case ProtocolStateMachineCompositeEditPart.VISUAL_ID:
-			return createProtocolStateMachine_2062(domainElement, containerView, index, persisted, preferencesHint);
-		case StateMachineCompositeEditPart.VISUAL_ID:
-			return createStateMachine_2063(domainElement, containerView, index, persisted, preferencesHint);
-		case FunctionBehaviorCompositeEditPart.VISUAL_ID:
-			return createFunctionBehavior_2064(domainElement, containerView, index, persisted, preferencesHint);
-		case OpaqueBehaviorCompositeEditPart.VISUAL_ID:
-			return createOpaqueBehavior_2065(domainElement, containerView, index, persisted, preferencesHint);
-		case ComponentCompositeEditPart.VISUAL_ID:
-			return createComponent_2069(domainElement, containerView, index, persisted, preferencesHint);
-		case DeviceCompositeEditPart.VISUAL_ID:
-			return createDevice_2070(domainElement, containerView, index, persisted, preferencesHint);
-		case ExecutionEnvironmentCompositeEditPart.VISUAL_ID:
-			return createExecutionEnvironment_2071(domainElement, containerView, index, persisted, preferencesHint);
-		case NodeCompositeEditPart.VISUAL_ID:
-			return createNode_2072(domainElement, containerView, index, persisted, preferencesHint);
-		case ClassCompositeEditPart.VISUAL_ID:
-			return createClass_2073(domainElement, containerView, index, persisted, preferencesHint);
-		case CollaborationCompositeEditPart.VISUAL_ID:
-			return createCollaboration_2075(domainElement, containerView, index, persisted, preferencesHint);
-		case InterfaceEditPart.VISUAL_ID:
-			return createInterface_2076(domainElement, containerView, index, persisted, preferencesHint);
-		case PrimitiveTypeEditPart.VISUAL_ID:
-			return createPrimitiveType_2066(domainElement, containerView, index, persisted, preferencesHint);
-		case EnumerationEditPart.VISUAL_ID:
-			return createEnumeration_2067(domainElement, containerView, index, persisted, preferencesHint);
-		case DataTypeEditPart.VISUAL_ID:
-			return createDataType_2068(domainElement, containerView, index, persisted, preferencesHint);
-		case ActorEditPart.VISUAL_ID:
-			return createActor_2077(domainElement, containerView, index, persisted, preferencesHint);
-		case DeploymentSpecificationEditPart.VISUAL_ID:
-			return createDeploymentSpecification_2078(domainElement, containerView, index, persisted, preferencesHint);
-		case ArtifactEditPart.VISUAL_ID:
-			return createArtifact_2079(domainElement, containerView, index, persisted, preferencesHint);
-		case InformationItemEditPart.VISUAL_ID:
-			return createInformationItem_2080(domainElement, containerView, index, persisted, preferencesHint);
-		case SignalEditPart.VISUAL_ID:
-			return createSignal_2081(domainElement, containerView, index, persisted, preferencesHint);
-		case UseCaseEditPart.VISUAL_ID:
-			return createUseCase_2082(domainElement, containerView, index, persisted, preferencesHint);
-		case SignalEventEditPart.VISUAL_ID:
-			return createSignalEvent_2083(domainElement, containerView, index, persisted, preferencesHint);
-		case CallEventEditPart.VISUAL_ID:
-			return createCallEvent_2084(domainElement, containerView, index, persisted, preferencesHint);
-		case AnyReceiveEventEditPart.VISUAL_ID:
-			return createAnyReceiveEvent_2085(domainElement, containerView, index, persisted, preferencesHint);
-		case ChangeEventEditPart.VISUAL_ID:
-			return createChangeEvent_2088(domainElement, containerView, index, persisted, preferencesHint);
-		case TimeEventEditPart.VISUAL_ID:
-			return createTimeEvent_2089(domainElement, containerView, index, persisted, preferencesHint);
-		case DurationObservationEditPart.VISUAL_ID:
-			return createDurationObservation_2093(domainElement, containerView, index, persisted, preferencesHint);
-		case TimeObservationEditPart.VISUAL_ID:
-			return createTimeObservation_2094(domainElement, containerView, index, persisted, preferencesHint);
-		case LiteralBooleanEditPart.VISUAL_ID:
-			return createLiteralBoolean_2095(domainElement, containerView, index, persisted, preferencesHint);
-		case LiteralIntegerEditPart.VISUAL_ID:
-			return createLiteralInteger_2096(domainElement, containerView, index, persisted, preferencesHint);
-		case LiteralNullEditPart.VISUAL_ID:
-			return createLiteralNull_2097(domainElement, containerView, index, persisted, preferencesHint);
-		case LiteralStringEditPart.VISUAL_ID:
-			return createLiteralString_2098(domainElement, containerView, index, persisted, preferencesHint);
-		case LiteralUnlimitedNaturalEditPart.VISUAL_ID:
-			return createLiteralUnlimitedNatural_2099(domainElement, containerView, index, persisted, preferencesHint);
-		case StringExpressionEditPart.VISUAL_ID:
-			return createStringExpression_2100(domainElement, containerView, index, persisted, preferencesHint);
-		case OpaqueExpressionEditPart.VISUAL_ID:
-			return createOpaqueExpression_2101(domainElement, containerView, index, persisted, preferencesHint);
-		case TimeExpressionEditPart.VISUAL_ID:
-			return createTimeExpression_2102(domainElement, containerView, index, persisted, preferencesHint);
-		case ExpressionEditPart.VISUAL_ID:
-			return createExpression_2103(domainElement, containerView, index, persisted, preferencesHint);
-		case DurationEditPart.VISUAL_ID:
-			return createDuration_2104(domainElement, containerView, index, persisted, preferencesHint);
-		case TimeIntervalEditPart.VISUAL_ID:
-			return createTimeInterval_2105(domainElement, containerView, index, persisted, preferencesHint);
-		case DurationIntervalEditPart.VISUAL_ID:
-			return createDurationInterval_2106(domainElement, containerView, index, persisted, preferencesHint);
-		case IntervalEditPart.VISUAL_ID:
-			return createInterval_2107(domainElement, containerView, index, persisted, preferencesHint);
-		case InstanceValueEditPart.VISUAL_ID:
-			return createInstanceValue_2108(domainElement, containerView, index, persisted, preferencesHint);
-		case CommentEditPart.VISUAL_ID:
-			return createComment_2109(domainElement, containerView, index, persisted, preferencesHint);
-		case DurationConstraintEditPart.VISUAL_ID:
-			return createDurationConstraint_2110(domainElement, containerView, index, persisted, preferencesHint);
-		case TimeConstraintEditPart.VISUAL_ID:
-			return createTimeConstraint_2111(domainElement, containerView, index, persisted, preferencesHint);
-		case IntervalConstraintEditPart.VISUAL_ID:
-			return createIntervalConstraint_2112(domainElement, containerView, index, persisted, preferencesHint);
-		case InteractionConstraintEditPart.VISUAL_ID:
-			return createInteractionConstraint_2113(domainElement, containerView, index, persisted, preferencesHint);
-		case ConstraintEditPart.VISUAL_ID:
-			return createConstraint_2114(domainElement, containerView, index, persisted, preferencesHint);
-		case BehaviorPortEditPart.VISUAL_ID:
-			return createNode_3121(domainElement, containerView, index, persisted, preferencesHint);
-		case PortEditPart.VISUAL_ID:
-			return createPort_3069(domainElement, containerView, index, persisted, preferencesHint);
-		case ParameterEditPart.VISUAL_ID:
-			return createParameter_3088(domainElement, containerView, index, persisted, preferencesHint);
-		case PropertyPartEditPartCN.VISUAL_ID:
-			return createProperty_3070(domainElement, containerView, index, persisted, preferencesHint);
-		case CollaborationRoleEditPartCN.VISUAL_ID:
-			return createConnectableElement_3115(domainElement, containerView, index, persisted, preferencesHint);
-		case CollaborationUseEditPartCN.VISUAL_ID:
-			return createCollaborationUse_3071(domainElement, containerView, index, persisted, preferencesHint);
-		case ActivityCompositeEditPartCN.VISUAL_ID:
-			return createActivity_3072(domainElement, containerView, index, persisted, preferencesHint);
-		case InteractionCompositeEditPartCN.VISUAL_ID:
-			return createInteraction_3073(domainElement, containerView, index, persisted, preferencesHint);
-		case ProtocolStateMachineCompositeEditPartCN.VISUAL_ID:
-			return createProtocolStateMachine_3074(domainElement, containerView, index, persisted, preferencesHint);
-		case StateMachineCompositeEditPartCN.VISUAL_ID:
-			return createStateMachine_3075(domainElement, containerView, index, persisted, preferencesHint);
-		case FunctionBehaviorCompositeEditPartCN.VISUAL_ID:
-			return createFunctionBehavior_3076(domainElement, containerView, index, persisted, preferencesHint);
-		case OpaqueBehaviorCompositeEditPartCN.VISUAL_ID:
-			return createOpaqueBehavior_3077(domainElement, containerView, index, persisted, preferencesHint);
-		case ComponentCompositeEditPartCN.VISUAL_ID:
-			return createComponent_3081(domainElement, containerView, index, persisted, preferencesHint);
-		case DeviceCompositeEditPartCN.VISUAL_ID:
-			return createDevice_3082(domainElement, containerView, index, persisted, preferencesHint);
-		case ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID:
-			return createExecutionEnvironment_3083(domainElement, containerView, index, persisted, preferencesHint);
-		case NodeCompositeEditPartCN.VISUAL_ID:
-			return createNode_3084(domainElement, containerView, index, persisted, preferencesHint);
-		case ClassCompositeEditPartCN.VISUAL_ID:
-			return createClass_3085(domainElement, containerView, index, persisted, preferencesHint);
-		case CollaborationCompositeEditPartCN.VISUAL_ID:
-			return createCollaboration_3086(domainElement, containerView, index, persisted, preferencesHint);
-		case InterfaceEditPartCN.VISUAL_ID:
-			return createInterface_3087(domainElement, containerView, index, persisted, preferencesHint);
-		case PrimitiveTypeEditPartCN.VISUAL_ID:
-			return createPrimitiveType_3078(domainElement, containerView, index, persisted, preferencesHint);
-		case EnumerationEditPartCN.VISUAL_ID:
-			return createEnumeration_3079(domainElement, containerView, index, persisted, preferencesHint);
-		case DataTypeEditPartCN.VISUAL_ID:
-			return createDataType_3080(domainElement, containerView, index, persisted, preferencesHint);
-		case ActorEditPartCN.VISUAL_ID:
-			return createActor_3091(domainElement, containerView, index, persisted, preferencesHint);
-		case DeploymentSpecificationEditPartCN.VISUAL_ID:
-			return createDeploymentSpecification_3092(domainElement, containerView, index, persisted, preferencesHint);
-		case ArtifactEditPartCN.VISUAL_ID:
-			return createArtifact_3093(domainElement, containerView, index, persisted, preferencesHint);
-		case InformationItemEditPartCN.VISUAL_ID:
-			return createInformationItem_3094(domainElement, containerView, index, persisted, preferencesHint);
-		case SignalEditPartCN.VISUAL_ID:
-			return createSignal_3095(domainElement, containerView, index, persisted, preferencesHint);
-		case UseCaseEditPartCN.VISUAL_ID:
-			return createUseCase_3096(domainElement, containerView, index, persisted, preferencesHint);
-		case CommentEditPartCN.VISUAL_ID:
-			return createComment_3097(domainElement, containerView, index, persisted, preferencesHint);
-		case DurationConstraintEditPartCN.VISUAL_ID:
-			return createDurationConstraint_3116(domainElement, containerView, index, persisted, preferencesHint);
-		case TimeConstraintEditPartCN.VISUAL_ID:
-			return createTimeConstraint_3117(domainElement, containerView, index, persisted, preferencesHint);
-		case IntervalConstraintEditPartCN.VISUAL_ID:
-			return createIntervalConstraint_3118(domainElement, containerView, index, persisted, preferencesHint);
-		case InteractionConstraintEditPartCN.VISUAL_ID:
-			return createInteractionConstraint_3119(domainElement, containerView, index, persisted, preferencesHint);
-		case ConstraintEditPartCN.VISUAL_ID:
-			return createConstraint_3120(domainElement, containerView, index, persisted, preferencesHint);
-		case PropertyEditPartCLN.VISUAL_ID:
-			return createProperty_3101(domainElement, containerView, index, persisted, preferencesHint);
-		case OperationEditPartCLN.VISUAL_ID:
-			return createOperation_3102(domainElement, containerView, index, persisted, preferencesHint);
-		case EnumerationLiteralEditPartCLN.VISUAL_ID:
-			return createEnumerationLiteral_3066(domainElement, containerView, index, persisted, preferencesHint);
-		}
-		// can't happen, provided #provides(CreateNodeViewOperation) is correct
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	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)) {
-		case BehaviorPortLinkEditPart.VISUAL_ID:
-			return createLink_4022(containerView, index, persisted, preferencesHint);
-		case LinkDescriptorEditPart.VISUAL_ID:
-			return createLink_4001(containerView, index, persisted, preferencesHint);
-		case CommentAnnotatedElementEditPart.VISUAL_ID:
-			return createCommentAnnotatedElement_4002(containerView, index, persisted, preferencesHint);
-		case ConstraintConstrainedElementEditPart.VISUAL_ID:
-			return createConstraintConstrainedElement_4003(containerView, index, persisted, preferencesHint);
-		case ComponentRealizationEditPart.VISUAL_ID:
-			return createComponentRealization_4004(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);
-		case InterfaceRealizationEditPart.VISUAL_ID:
-			return createInterfaceRealization_4005(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);
-		case SubstitutionEditPart.VISUAL_ID:
-			return createSubstitution_4011(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);
-		case RealizationEditPart.VISUAL_ID:
-			return createRealization_4006(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);
-		case ManifestationEditPart.VISUAL_ID:
-			return createManifestation_4012(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);
-		case AbstractionEditPart.VISUAL_ID:
-			return createAbstraction_4007(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);
-		case UsageEditPart.VISUAL_ID:
-			return createUsage_4008(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);
-		case DeploymentEditPart.VISUAL_ID:
-			return createDeployment_4009(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);
-		case RoleBindingEditPart.VISUAL_ID:
-			return createDependency_4017(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);
-		case DependencyEditPart.VISUAL_ID:
-			return createDependency_4010(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);
-		case ConnectorEditPart.VISUAL_ID:
-			return createConnector_4013(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);
-		case GeneralizationEditPart.VISUAL_ID:
-			return createGeneralization_4015(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);
-		case TimeObservationEventEditPart.VISUAL_ID:
-			return createTimeObservationEvent_4018(containerView, index, persisted, preferencesHint);
-		case DurationObservationEventEditPart.VISUAL_ID:
-			return createDurationObservationEvent_4019(containerView, index, persisted, preferencesHint);
-		case RepresentationEditPart.VISUAL_ID:
-			return createInformationItemRepresented_4020(containerView, index, persisted, preferencesHint);
-		case InformationFlowEditPart.VISUAL_ID:
-			return createInformationFlow_4021(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);
-		}
-		// can never happen, provided #provides(CreateEdgeViewOperation) is correct
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createActivity_2060(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(ActivityCompositeEditPart.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, "Activity");
-		Node label5112 = createLabel(node, UMLVisualIDRegistry.getType(ActivityCompositeNameEditPart.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(ActivityCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Activity");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createInteraction_2061(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(InteractionCompositeEditPart.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, "Interaction");
-		Node label5113 = createLabel(node, UMLVisualIDRegistry.getType(InteractionCompositeNameEditPart.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(InteractionCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Interaction");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createProtocolStateMachine_2062(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeEditPart.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, "ProtocolStateMachine");
-		Node label5114 = createLabel(node, UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeNameEditPart.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "ProtocolStateMachine");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createStateMachine_2063(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(StateMachineCompositeEditPart.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, "StateMachine");
-		Node label5115 = createLabel(node, UMLVisualIDRegistry.getType(StateMachineCompositeNameEditPart.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(StateMachineCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "StateMachine");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createFunctionBehavior_2064(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(FunctionBehaviorCompositeEditPart.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, "FunctionBehavior");
-		Node label5116 = createLabel(node, UMLVisualIDRegistry.getType(FunctionBehaviorCompositeNameEditPart.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "FunctionBehavior");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createOpaqueBehavior_2065(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeEditPart.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, "OpaqueBehavior");
-		Node label5117 = createLabel(node, UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeNameEditPart.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "OpaqueBehavior");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createComponent_2069(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(ComponentCompositeEditPart.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, "Component");
-		Node label5121 = createLabel(node, UMLVisualIDRegistry.getType(ComponentCompositeNameEditPart.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(ComponentCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Component");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createDevice_2070(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(DeviceCompositeEditPart.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, "Device");
-		Node label5122 = createLabel(node, UMLVisualIDRegistry.getType(DeviceCompositeNameEditPart.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(DeviceCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Device");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createExecutionEnvironment_2071(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeEditPart.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, "ExecutionEnvironment");
-		Node label5123 = createLabel(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeNameEditPart.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "ExecutionEnvironment");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createNode_2072(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(NodeCompositeEditPart.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, "Node");
-		Node label5124 = createLabel(node, UMLVisualIDRegistry.getType(NodeCompositeNameEditPart.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(NodeCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Node");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createClass_2073(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(ClassCompositeEditPart.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, "Class");
-		Node label5156 = createLabel(node, UMLVisualIDRegistry.getType(ClassCompositeNameEditPart.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(ClassCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Class");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createCollaboration_2075(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(CollaborationCompositeEditPart.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, "Collaboration");
-		Node label5158 = createLabel(node, UMLVisualIDRegistry.getType(CollaborationCompositeNameEditPart.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(CollaborationCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Collaboration");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createInterface_2076(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(InterfaceEditPart.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, "Interface");
-		Node label5159 = createLabel(node, UMLVisualIDRegistry.getType(InterfaceNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createPrimitiveType_2066(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(PrimitiveTypeEditPart.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, "PrimitiveType");
-		Node label5118 = createLabel(node, UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createEnumeration_2067(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(EnumerationEditPart.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, "Enumeration");
-		Node label5119 = createLabel(node, UMLVisualIDRegistry.getType(EnumerationNameEditPart.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID), true, true, true, true);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Enumeration");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createDataType_2068(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(DataTypeEditPart.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, "DataType");
-		Node label5120 = createLabel(node, UMLVisualIDRegistry.getType(DataTypeNameEditPart.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPart.VISUAL_ID), true, true, true, true);
-		createCompartment(node, UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPart.VISUAL_ID), true, true, true, true);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "DataType");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createActor_2077(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(ActorEditPart.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, "Actor");
-		Node label5160 = createLabel(node, UMLVisualIDRegistry.getType(ActorNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createDeploymentSpecification_2078(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(DeploymentSpecificationEditPart.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, "DeploymentSpecification");
-		Node label5161 = createLabel(node, UMLVisualIDRegistry.getType(DeploymentSpecificationNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createArtifact_2079(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(ArtifactEditPart.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, "Artifact");
-		Node label5162 = createLabel(node, UMLVisualIDRegistry.getType(ArtifactNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createInformationItem_2080(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(InformationItemEditPart.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, "InformationItem");
-		Node label5163 = createLabel(node, UMLVisualIDRegistry.getType(InformationItemNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createSignal_2081(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(SignalEditPart.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, "Signal");
-		Node label5164 = createLabel(node, UMLVisualIDRegistry.getType(SignalNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createUseCase_2082(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(UseCaseEditPart.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, "UseCase");
-		Node label5165 = createLabel(node, UMLVisualIDRegistry.getType(UseCaseNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createSignalEvent_2083(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(SignalEventEditPart.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, "SignalEvent");
-		Node label5166 = createLabel(node, UMLVisualIDRegistry.getType(SignalEventNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createCallEvent_2084(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(CallEventEditPart.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, "CallEvent");
-		Node label5167 = createLabel(node, UMLVisualIDRegistry.getType(CallEventNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createAnyReceiveEvent_2085(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(AnyReceiveEventEditPart.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, "AnyReceiveEvent");
-		Node label5168 = createLabel(node, UMLVisualIDRegistry.getType(AnyReceiveEventNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createChangeEvent_2088(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(ChangeEventEditPart.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, "ChangeEvent");
-		Node label5171 = createLabel(node, UMLVisualIDRegistry.getType(ChangeEventNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createTimeEvent_2089(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(TimeEventEditPart.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, "TimeEvent");
-		Node label5172 = createLabel(node, UMLVisualIDRegistry.getType(TimeEventNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createDurationObservation_2093(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(DurationObservationEditPart.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, "DurationObservation");
-		Node label5151 = createLabel(node, UMLVisualIDRegistry.getType(DurationObservationNameEditPart.VISUAL_ID));
-		label5151.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location5151 = (Location) label5151.getLayoutConstraint();
-		location5151.setX(25);
-		location5151.setY(3);
-		Node label5152 = createLabel(node, UMLVisualIDRegistry.getType(DurationObservationStereotypeLabelEditPart.VISUAL_ID));
-		label5152.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location5152 = (Location) label5152.getLayoutConstraint();
-		location5152.setX(25);
-		location5152.setY(-10);
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createTimeObservation_2094(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(TimeObservationEditPart.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, "TimeObservation");
-		Node label5142 = createLabel(node, UMLVisualIDRegistry.getType(TimeObservationNameEditPart.VISUAL_ID));
-		label5142.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location5142 = (Location) label5142.getLayoutConstraint();
-		location5142.setX(25);
-		location5142.setY(3);
-		Node label5143 = createLabel(node, UMLVisualIDRegistry.getType(TimeObservationStereotypeLabelEditPart.VISUAL_ID));
-		label5143.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location5143 = (Location) label5143.getLayoutConstraint();
-		location5143.setX(25);
-		location5143.setY(-10);
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createLiteralBoolean_2095(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(LiteralBooleanEditPart.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, "LiteralBoolean");
-		Node label5178 = createLabel(node, UMLVisualIDRegistry.getType(LiteralBooleanNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createLiteralInteger_2096(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(LiteralIntegerEditPart.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, "LiteralInteger");
-		Node label5179 = createLabel(node, UMLVisualIDRegistry.getType(LiteralIntegerNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createLiteralNull_2097(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(LiteralNullEditPart.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, "LiteralNull");
-		Node label5180 = createLabel(node, UMLVisualIDRegistry.getType(LiteralNullNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createLiteralString_2098(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(LiteralStringEditPart.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, "LiteralString");
-		Node label5181 = createLabel(node, UMLVisualIDRegistry.getType(LiteralStringNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createLiteralUnlimitedNatural_2099(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(LiteralUnlimitedNaturalEditPart.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, "LiteralUnlimitedNatural");
-		Node label5182 = createLabel(node, UMLVisualIDRegistry.getType(LiteralUnlimitedNaturalNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createStringExpression_2100(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(StringExpressionEditPart.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, "StringExpression");
-		Node label5183 = createLabel(node, UMLVisualIDRegistry.getType(StringExpressionNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createOpaqueExpression_2101(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(OpaqueExpressionEditPart.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, "OpaqueExpression");
-		Node label5184 = createLabel(node, UMLVisualIDRegistry.getType(OpaqueExpressionNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createTimeExpression_2102(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(TimeExpressionEditPart.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, "TimeExpression");
-		Node label5185 = createLabel(node, UMLVisualIDRegistry.getType(TimeExpressionNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createExpression_2103(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(ExpressionEditPart.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, "Expression");
-		Node label5186 = createLabel(node, UMLVisualIDRegistry.getType(ExpressionNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createDuration_2104(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(DurationEditPart.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, "Duration");
-		Node label5187 = createLabel(node, UMLVisualIDRegistry.getType(DurationNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createTimeInterval_2105(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(TimeIntervalEditPart.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, "TimeInterval");
-		Node label5188 = createLabel(node, UMLVisualIDRegistry.getType(TimeIntervalNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createDurationInterval_2106(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(DurationIntervalEditPart.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, "DurationInterval");
-		Node label5189 = createLabel(node, UMLVisualIDRegistry.getType(DurationIntervalNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createInterval_2107(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(IntervalEditPart.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, "Interval");
-		Node label5190 = createLabel(node, UMLVisualIDRegistry.getType(IntervalNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createInstanceValue_2108(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(InstanceValueEditPart.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, "InstanceValue");
-		Node label5191 = createLabel(node, UMLVisualIDRegistry.getType(InstanceValueNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createComment_2109(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(CommentEditPart.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, "Comment");
-		Node label5192 = createLabel(node, UMLVisualIDRegistry.getType(CommentBodyEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createDurationConstraint_2110(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(DurationConstraintEditPart.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, "DurationConstraint");
-		Node label5193 = createLabel(node, UMLVisualIDRegistry.getType(DurationConstraintNameEditPart.VISUAL_ID));
-		Node label6035 = createLabel(node, UMLVisualIDRegistry.getType(DurationConstraintSpecificationEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createTimeConstraint_2111(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(TimeConstraintEditPart.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, "TimeConstraint");
-		Node label5194 = createLabel(node, UMLVisualIDRegistry.getType(TimeConstraintNameEditPart.VISUAL_ID));
-		Node label6036 = createLabel(node, UMLVisualIDRegistry.getType(TimeConstraintSpecificationEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createIntervalConstraint_2112(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(IntervalConstraintEditPart.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, "IntervalConstraint");
-		Node label5195 = createLabel(node, UMLVisualIDRegistry.getType(IntervalConstraintNameEditPart.VISUAL_ID));
-		Node label6037 = createLabel(node, UMLVisualIDRegistry.getType(IntervalConstraintSpecificationEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createInteractionConstraint_2113(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(InteractionConstraintEditPart.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, "InteractionConstraint");
-		Node label5196 = createLabel(node, UMLVisualIDRegistry.getType(InteractionConstraintNameEditPart.VISUAL_ID));
-		Node label6038 = createLabel(node, UMLVisualIDRegistry.getType(InteractionConstraintSpecificationEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createConstraint_2114(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(ConstraintEditPart.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 label5197 = createLabel(node, UMLVisualIDRegistry.getType(ConstraintNameEditPart.VISUAL_ID));
-		Node label6039 = createLabel(node, UMLVisualIDRegistry.getType(ConstraintSpecificationEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createNode_3121(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(BehaviorPortEditPart.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createPort_3069(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(PortEditPart.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Port");
-		Node label5125 = createLabel(node, UMLVisualIDRegistry.getType(PortNameEditPart.VISUAL_ID));
-		label5125.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location5125 = (Location) label5125.getLayoutConstraint();
-		location5125.setX(25);
-		location5125.setY(3);
-		Node label6029 = createLabel(node, UMLVisualIDRegistry.getType(PortAppliedStereotypeEditPart.VISUAL_ID));
-		label6029.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6029 = (Location) label6029.getLayoutConstraint();
-		location6029.setX(25);
-		location6029.setY(-10);
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createParameter_3088(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(ParameterEditPart.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Parameter");
-		Node label6033 = createLabel(node, UMLVisualIDRegistry.getType(ParameterNameEditPart.VISUAL_ID));
-		label6033.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6033 = (Location) label6033.getLayoutConstraint();
-		location6033.setX(25);
-		location6033.setY(3);
-		Node label6034 = createLabel(node, UMLVisualIDRegistry.getType(ParameterAppliedStereotypeEditPart.VISUAL_ID));
-		label6034.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6034 = (Location) label6034.getLayoutConstraint();
-		location6034.setX(25);
-		location6034.setY(-10);
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createProperty_3070(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(PropertyPartEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Property");
-		Node label5126 = createLabel(node, UMLVisualIDRegistry.getType(PropertyPartNameEditPartCN.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(PropertyPartCompartmentEditPartCN.VISUAL_ID), true, true, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Property");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createConnectableElement_3115(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(CollaborationRoleEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "CollaborationRole");
-		Node label5198 = createLabel(node, UMLVisualIDRegistry.getType(CollaborationRoleNameEditPartCN.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createCollaborationUse_3071(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(CollaborationUseEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "CollaborationUse");
-		Node label5127 = createLabel(node, UMLVisualIDRegistry.getType(CollaborationUseNameEditPart.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createActivity_3072(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(ActivityCompositeEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Activity");
-		Node label5128 = createLabel(node, UMLVisualIDRegistry.getType(ActivityCompositeNameEditPartCN.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(ActivityCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Activity");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createInteraction_3073(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(InteractionCompositeEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Interaction");
-		Node label5129 = createLabel(node, UMLVisualIDRegistry.getType(InteractionCompositeNameEditPartCN.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(InteractionCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Interaction");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createProtocolStateMachine_3074(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ProtocolStateMachine");
-		Node label5130 = createLabel(node, UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeNameEditPartCN.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "ProtocolStateMachine");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createStateMachine_3075(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(StateMachineCompositeEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "StateMachine");
-		Node label5131 = createLabel(node, UMLVisualIDRegistry.getType(StateMachineCompositeNameEditPartCN.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(StateMachineCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "StateMachine");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createFunctionBehavior_3076(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(FunctionBehaviorCompositeEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "FunctionBehavior");
-		Node label5132 = createLabel(node, UMLVisualIDRegistry.getType(FunctionBehaviorCompositeNameEditPartCN.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "FunctionBehavior");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createOpaqueBehavior_3077(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "OpaqueBehavior");
-		Node label5133 = createLabel(node, UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeNameEditPartCN.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "OpaqueBehavior");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createComponent_3081(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(ComponentCompositeEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Component");
-		Node label5137 = createLabel(node, UMLVisualIDRegistry.getType(ComponentCompositeNameEditPartCN.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(ComponentCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Component");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createDevice_3082(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(DeviceCompositeEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Device");
-		Node label5138 = createLabel(node, UMLVisualIDRegistry.getType(DeviceCompositeNameEditPartCN.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(DeviceCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Device");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createExecutionEnvironment_3083(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ExecutionEnvironment");
-		Node label5139 = createLabel(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeNameEditPartCN.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "ExecutionEnvironment");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createNode_3084(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(NodeCompositeEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Node");
-		Node label5140 = createLabel(node, UMLVisualIDRegistry.getType(NodeCompositeNameEditPartCN.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(NodeCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Node");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createClass_3085(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(ClassCompositeEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Class");
-		Node label5155 = createLabel(node, UMLVisualIDRegistry.getType(ClassCompositeNameEditPartCN.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(ClassCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Class");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createCollaboration_3086(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(CollaborationCompositeEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Collaboration");
-		Node label5141 = createLabel(node, UMLVisualIDRegistry.getType(CollaborationCompositeNameEditPartCN.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(CollaborationCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Collaboration");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createInterface_3087(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(InterfaceEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Interface");
-		Node label5154 = createLabel(node, UMLVisualIDRegistry.getType(InterfaceNameEditPartCN.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createPrimitiveType_3078(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(PrimitiveTypeEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "PrimitiveType");
-		Node label5134 = createLabel(node, UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPartCN.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createEnumeration_3079(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(EnumerationEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Enumeration");
-		Node label5135 = createLabel(node, UMLVisualIDRegistry.getType(EnumerationNameEditPartCN.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID), true, true, true, true);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Enumeration");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createDataType_3080(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(DataTypeEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DataType");
-		Node label5136 = createLabel(node, UMLVisualIDRegistry.getType(DataTypeNameEditPartCN.VISUAL_ID));
-		createCompartment(node, UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPartCN.VISUAL_ID), true, true, true, true);
-		createCompartment(node, UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPartCN.VISUAL_ID), true, true, true, true);
-		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "DataType");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createActor_3091(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(ActorEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Actor");
-		Node label5144 = createLabel(node, UMLVisualIDRegistry.getType(ActorNameEditPartCN.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createDeploymentSpecification_3092(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(DeploymentSpecificationEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DeploymentSpecification");
-		Node label5145 = createLabel(node, UMLVisualIDRegistry.getType(DeploymentSpecificationNameEditPartCN.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createArtifact_3093(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(ArtifactEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Artifact");
-		Node label5146 = createLabel(node, UMLVisualIDRegistry.getType(ArtifactNameEditPartCN.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createInformationItem_3094(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(InformationItemEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "InformationItem");
-		Node label5147 = createLabel(node, UMLVisualIDRegistry.getType(InformationItemNameEditPartCN.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createSignal_3095(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(SignalEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Signal");
-		Node label5148 = createLabel(node, UMLVisualIDRegistry.getType(SignalNameEditPartCN.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createUseCase_3096(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(NotationFactory.eINSTANCE.createDescriptionStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		node.getStyles().add(NotationFactory.eINSTANCE.createFillStyle());
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(UseCaseEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "UseCase");
-		Node label5149 = createLabel(node, UMLVisualIDRegistry.getType(UseCaseNameEditPartCN.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createComment_3097(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		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.initFontStyleFromPrefs(node, prefStore, "Comment");
-		Node label5150 = createLabel(node, UMLVisualIDRegistry.getType(CommentBodyEditPartCN.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createDurationConstraint_3116(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(DurationConstraintEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DurationConstraint");
-		Node label6040 = createLabel(node, UMLVisualIDRegistry.getType(DurationConstraintNameEditPartCN.VISUAL_ID));
-		Node label6041 = createLabel(node, UMLVisualIDRegistry.getType(DurationConstraintSpecificationEditPartCN.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createTimeConstraint_3117(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(TimeConstraintEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "TimeConstraint");
-		Node label6042 = createLabel(node, UMLVisualIDRegistry.getType(TimeConstraintNameEditPartCN.VISUAL_ID));
-		Node label6043 = createLabel(node, UMLVisualIDRegistry.getType(TimeConstraintSpecificationEditPartCN.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createIntervalConstraint_3118(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(IntervalConstraintEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "IntervalConstraint");
-		Node label6044 = createLabel(node, UMLVisualIDRegistry.getType(IntervalConstraintNameEditPartCN.VISUAL_ID));
-		Node label6045 = createLabel(node, UMLVisualIDRegistry.getType(IntervalConstraintSpecificationEditPartCN.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createInteractionConstraint_3119(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(InteractionConstraintEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "InteractionConstraint");
-		Node label6046 = createLabel(node, UMLVisualIDRegistry.getType(InteractionConstraintNameEditPartCN.VISUAL_ID));
-		Node label6047 = createLabel(node, UMLVisualIDRegistry.getType(InteractionConstraintSpecificationEditPartCN.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createConstraint_3120(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Shape node = NotationFactory.eINSTANCE.createShape();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		node.setType(UMLVisualIDRegistry.getType(ConstraintEditPartCN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		// initializeFromPreferences 
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Constraint");
-		Node label6048 = createLabel(node, UMLVisualIDRegistry.getType(ConstraintNameEditPartCN.VISUAL_ID));
-		Node label6049 = createLabel(node, UMLVisualIDRegistry.getType(ConstraintSpecificationEditPartCN.VISUAL_ID));
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createProperty_3101(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		node.setType(UMLVisualIDRegistry.getType(PropertyEditPartCLN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Property");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createOperation_3102(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		node.setType(UMLVisualIDRegistry.getType(OperationEditPartCLN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Operation");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Node createEnumerationLiteral_3066(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Node node = NotationFactory.eINSTANCE.createNode();
-		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		node.setType(UMLVisualIDRegistry.getType(EnumerationLiteralEditPartCLN.VISUAL_ID));
-		ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "EnumerationLiteral");
-		return node;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Edge createLink_4022(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Connector edge = NotationFactory.eINSTANCE.createConnector();
-		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();
-		List<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(BehaviorPortLinkEditPart.VISUAL_ID));
-		edge.setElement(null);
-		// initializePreferences
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		//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);
-		//}
-		return edge;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Edge createLink_4001(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Connector edge = NotationFactory.eINSTANCE.createConnector();
-		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();
-		List<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(LinkDescriptorEditPart.VISUAL_ID));
-		edge.setElement(null);
-		// initializePreferences
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		//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);
-		//}
-		return edge;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Edge createCommentAnnotatedElement_4002(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Connector edge = NotationFactory.eINSTANCE.createConnector();
-		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();
-		List<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.setElement(null);
-		// initializePreferences
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "CommentAnnotatedElement");
-		//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);
-		//}
-		return edge;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Edge createConstraintConstrainedElement_4003(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Connector edge = NotationFactory.eINSTANCE.createConnector();
-		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();
-		List<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.setElement(null);
-		// initializePreferences
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "ConstraintConstrainedElement");
-		//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);
-		//}
-		return edge;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Edge createComponentRealization_4004(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();
-		List<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(ComponentRealizationEditPart.VISUAL_ID));
-		edge.setElement(domainElement);
-		// initializePreferences
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "ComponentRealization");
-		//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);
-		//}
-		Node label6001 = createLabel(edge, UMLVisualIDRegistry.getType(ComponentRealizationNameEditPart.VISUAL_ID));
-		label6001.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6001 = (Location) label6001.getLayoutConstraint();
-		location6001.setX(0);
-		location6001.setY(60);
-		Node label6015 = createLabel(edge, UMLVisualIDRegistry.getType(ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID));
-		label6015.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6015 = (Location) label6015.getLayoutConstraint();
-		location6015.setX(0);
-		location6015.setY(30);
-		return edge;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Edge createInterfaceRealization_4005(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();
-		List<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(InterfaceRealizationEditPart.VISUAL_ID));
-		edge.setElement(domainElement);
-		// initializePreferences
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "InterfaceRealization");
-		//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);
-		//}
-		Node label6002 = createLabel(edge, UMLVisualIDRegistry.getType(InterfaceRealizationNameEditPart.VISUAL_ID));
-		label6002.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6002 = (Location) label6002.getLayoutConstraint();
-		location6002.setX(0);
-		location6002.setY(60);
-		Node label6016 = createLabel(edge, UMLVisualIDRegistry.getType(InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID));
-		label6016.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6016 = (Location) label6016.getLayoutConstraint();
-		location6016.setX(0);
-		location6016.setY(30);
-		return edge;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Edge createSubstitution_4011(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();
-		List<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(SubstitutionEditPart.VISUAL_ID));
-		edge.setElement(domainElement);
-		// initializePreferences
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Substitution");
-		//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);
-		//}
-		Node label6003 = createLabel(edge, UMLVisualIDRegistry.getType(SubstitutionNameEditPart.VISUAL_ID));
-		label6003.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6003 = (Location) label6003.getLayoutConstraint();
-		location6003.setX(0);
-		location6003.setY(60);
-		Node label6017 = createLabel(edge, UMLVisualIDRegistry.getType(SubstitutionAppliedStereotypeEditPart.VISUAL_ID));
-		label6017.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6017 = (Location) label6017.getLayoutConstraint();
-		location6017.setX(0);
-		location6017.setY(30);
-		return edge;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Edge createRealization_4006(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();
-		List<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(RealizationEditPart.VISUAL_ID));
-		edge.setElement(domainElement);
-		// initializePreferences
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		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);
-		//}
-		Node label6004 = createLabel(edge, UMLVisualIDRegistry.getType(RealizationNameEditPart.VISUAL_ID));
-		label6004.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6004 = (Location) label6004.getLayoutConstraint();
-		location6004.setX(0);
-		location6004.setY(60);
-		Node label6018 = createLabel(edge, UMLVisualIDRegistry.getType(RealizationAppliedStereotypeEditPart.VISUAL_ID));
-		label6018.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6018 = (Location) label6018.getLayoutConstraint();
-		location6018.setX(0);
-		location6018.setY(30);
-		return edge;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Edge createManifestation_4012(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();
-		List<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(ManifestationEditPart.VISUAL_ID));
-		edge.setElement(domainElement);
-		// initializePreferences
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Manifestation");
-		//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);
-		//}
-		Node label6005 = createLabel(edge, UMLVisualIDRegistry.getType(ManifestationNameEditPart.VISUAL_ID));
-		label6005.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6005 = (Location) label6005.getLayoutConstraint();
-		location6005.setX(0);
-		location6005.setY(60);
-		Node label6019 = createLabel(edge, UMLVisualIDRegistry.getType(ManifestationAppliedStereotypeEditPart.VISUAL_ID));
-		label6019.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6019 = (Location) label6019.getLayoutConstraint();
-		location6019.setX(0);
-		location6019.setY(30);
-		return edge;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Edge createAbstraction_4007(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();
-		List<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(AbstractionEditPart.VISUAL_ID));
-		edge.setElement(domainElement);
-		// initializePreferences
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		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);
-		//}
-		Node label6006 = createLabel(edge, UMLVisualIDRegistry.getType(AbstractionNameEditPart.VISUAL_ID));
-		label6006.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6006 = (Location) label6006.getLayoutConstraint();
-		location6006.setX(0);
-		location6006.setY(60);
-		Node label6020 = createLabel(edge, UMLVisualIDRegistry.getType(AbstractionAppliedStereotypeEditPart.VISUAL_ID));
-		label6020.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6020 = (Location) label6020.getLayoutConstraint();
-		location6020.setX(0);
-		location6020.setY(30);
-		return edge;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Edge createUsage_4008(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();
-		List<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(UsageEditPart.VISUAL_ID));
-		edge.setElement(domainElement);
-		// initializePreferences
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		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);
-		//}
-		Node label6007 = createLabel(edge, UMLVisualIDRegistry.getType(UsageNameEditPart.VISUAL_ID));
-		label6007.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6007 = (Location) label6007.getLayoutConstraint();
-		location6007.setX(0);
-		location6007.setY(60);
-		Node label6021 = createLabel(edge, UMLVisualIDRegistry.getType(UsageAppliedStereotypeEditPart.VISUAL_ID));
-		label6021.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6021 = (Location) label6021.getLayoutConstraint();
-		location6021.setX(0);
-		location6021.setY(30);
-		return edge;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Edge createDeployment_4009(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();
-		List<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(DeploymentEditPart.VISUAL_ID));
-		edge.setElement(domainElement);
-		// initializePreferences
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Deployment");
-		//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);
-		//}
-		Node label6008 = createLabel(edge, UMLVisualIDRegistry.getType(DeploymentNameEditPart.VISUAL_ID));
-		label6008.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6008 = (Location) label6008.getLayoutConstraint();
-		location6008.setX(0);
-		location6008.setY(60);
-		Node label6022 = createLabel(edge, UMLVisualIDRegistry.getType(DeploymentAppliedStereotypeEditPart.VISUAL_ID));
-		label6022.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6022 = (Location) label6022.getLayoutConstraint();
-		location6022.setX(0);
-		location6022.setY(30);
-		return edge;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Edge createDependency_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();
-		List<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(RoleBindingEditPart.VISUAL_ID));
-		edge.setElement(domainElement);
-		// initializePreferences
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "RoleBinding");
-		//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);
-		//}
-		Node label6027 = createLabel(edge, UMLVisualIDRegistry.getType(RoleBindingRoleNameEditPart.VISUAL_ID));
-		label6027.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6027 = (Location) label6027.getLayoutConstraint();
-		location6027.setX(0);
-		location6027.setY(20);
-		Node label6028 = createLabel(edge, UMLVisualIDRegistry.getType(RoleBindingAppliedStereotypeEditPart.VISUAL_ID));
-		label6028.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6028 = (Location) label6028.getLayoutConstraint();
-		location6028.setX(0);
-		location6028.setY(60);
-		return edge;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Edge createDependency_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();
-		List<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(DependencyEditPart.VISUAL_ID));
-		edge.setElement(domainElement);
-		// initializePreferences
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		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);
-		//}
-		Node label6009 = createLabel(edge, UMLVisualIDRegistry.getType(DependencyNameEditPart.VISUAL_ID));
-		label6009.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6009 = (Location) label6009.getLayoutConstraint();
-		location6009.setX(0);
-		location6009.setY(60);
-		Node label6023 = createLabel(edge, UMLVisualIDRegistry.getType(DependencyAppliedStereotypeEditPart.VISUAL_ID));
-		label6023.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6023 = (Location) label6023.getLayoutConstraint();
-		location6023.setX(0);
-		location6023.setY(60);
-		return edge;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Edge createConnector_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();
-		List<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(ConnectorEditPart.VISUAL_ID));
-		edge.setElement(domainElement);
-		// initializePreferences
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Connector");
-		//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);
-		//}
-		Node label6025 = createLabel(edge, UMLVisualIDRegistry.getType(ConnectorAppliedStereotypeEditPart.VISUAL_ID));
-		label6025.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6025 = (Location) label6025.getLayoutConstraint();
-		location6025.setX(0);
-		location6025.setY(60);
-		Node label6050 = createLabel(edge, UMLVisualIDRegistry.getType(ConnectorNameEditPart.VISUAL_ID));
-		label6050.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6050 = (Location) label6050.getLayoutConstraint();
-		location6050.setX(0);
-		location6050.setY(-20);
-		Node label6051 = createLabel(edge, UMLVisualIDRegistry.getType(ConnectorMultiplicitySourceEditPart.VISUAL_ID));
-		label6051.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6051 = (Location) label6051.getLayoutConstraint();
-		location6051.setX(0);
-		location6051.setY(20);
-		Node label6052 = createLabel(edge, UMLVisualIDRegistry.getType(ConnectorMultiplicityTargetEditPart.VISUAL_ID));
-		label6052.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6052 = (Location) label6052.getLayoutConstraint();
-		location6052.setX(0);
-		location6052.setY(20);
-		return edge;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Edge createGeneralization_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();
-		List<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.setElement(domainElement);
-		// initializePreferences
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		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);
-		//}
-		Node label6024 = createLabel(edge, UMLVisualIDRegistry.getType(GeneralizationAppliedStereotypeEditPart.VISUAL_ID));
-		label6024.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6024 = (Location) label6024.getLayoutConstraint();
-		location6024.setX(0);
-		location6024.setY(60);
-		return edge;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Edge createTimeObservationEvent_4018(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Connector edge = NotationFactory.eINSTANCE.createConnector();
-		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();
-		List<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(TimeObservationEventEditPart.VISUAL_ID));
-		edge.setElement(null);
-		// initializePreferences
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "TimeObservationEvent");
-		//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);
-		//}
-		return edge;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Edge createDurationObservationEvent_4019(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Connector edge = NotationFactory.eINSTANCE.createConnector();
-		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();
-		List<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(DurationObservationEventEditPart.VISUAL_ID));
-		edge.setElement(null);
-		// initializePreferences
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "DurationObservationEvent");
-		//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);
-		//}
-		return edge;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Edge createInformationItemRepresented_4020(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
-		Connector edge = NotationFactory.eINSTANCE.createConnector();
-		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());
-		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();
-		List<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(RepresentationEditPart.VISUAL_ID));
-		edge.setElement(null);
-		// initializePreferences
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.colorToInteger(ColorConstants.black));
-		//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);
-		//}
-		Node label6030 = createLabel(edge, UMLVisualIDRegistry.getType(RepresentationTagLabelEditPart.VISUAL_ID));
-		label6030.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6030 = (Location) label6030.getLayoutConstraint();
-		location6030.setX(0);
-		location6030.setY(15);
-		return edge;
-	}
-
-	/**
-	 * @generated
-	 */
-	public Edge createInformationFlow_4021(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();
-		List<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(InformationFlowEditPart.VISUAL_ID));
-		edge.setElement(domainElement);
-		// initializePreferences
-		final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
-		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "InformationFlow");
-		//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);
-		//}
-		Node label6031 = createLabel(edge, UMLVisualIDRegistry.getType(InformationFlowConveyedLabelEditPart.VISUAL_ID));
-		label6031.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6031 = (Location) label6031.getLayoutConstraint();
-		location6031.setX(0);
-		location6031.setY(30);
-		Node label6032 = createLabel(edge, UMLVisualIDRegistry.getType(InformationFlowAppliedStereotypeEditPart.VISUAL_ID));
-		label6032.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());
-		Location location6032 = (Location) label6032.getLayoutConstraint();
-		location6032.setX(0);
-		location6032.setY(15);
-		return edge;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected void stampShortcut(View containerView, Node target) {
-		if (!CompositeStructureDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(containerView))) {
-			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
-			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$
-			shortcutAnnotation.getDetails().put("modelID", CompositeStructureDiagramEditPart.MODEL_ID); //$NON-NLS-1$
-			target.getEAnnotations().add(shortcutAnnotation);
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	protected Node createLabel(View owner, String hint) {
-		DecorationNode rv = NotationFactory.eINSTANCE.createDecorationNode();
-		rv.setType(hint);
-		ViewUtil.insertChildView(owner, rv, ViewUtil.APPEND, true);
-		return rv;
-	}
-
-	/**
-	 * @generated
-	 */
-	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) {
-			rv = NotationFactory.eINSTANCE.createBasicCompartment();
-		} else {
-			rv = NotationFactory.eINSTANCE.createDecorationNode();
-		}
-		rv.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
-		if (hasTitle) {
-			TitleStyle ts = NotationFactory.eINSTANCE.createTitleStyle();
-			rv.getStyles().add(ts);
-		}
-		if (canSort) {
-			rv.getStyles().add(NotationFactory.eINSTANCE.createSortingStyle());
-		}
-		if (canFilter) {
-			rv.getStyles().add(NotationFactory.eINSTANCE.createFilteringStyle());
-		}
-		rv.setType(hint);
-		ViewUtil.insertChildView(owner, rv, ViewUtil.APPEND, true);
-		return rv;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected EObject getSemanticElement(IAdaptable semanticAdapter) {
-		if (semanticAdapter == null) {
-			return null;
-		}
-		EObject eObject = (EObject) semanticAdapter.getAdapter(EObject.class);
-		if (eObject != null) {
-			return EMFCoreUtil.resolve(TransactionUtil.getEditingDomain(eObject), eObject);
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	protected IElementType getSemanticElementType(IAdaptable semanticAdapter) {
-		if (semanticAdapter == null) {
-			return null;
-		}
-		return (IElementType) semanticAdapter.getAdapter(IElementType.class);
-	}
-
-	/**
-	 * @generated
-	 */
-	private void initFontStyleFromPrefs(View view, final IPreferenceStore store, String elementName)
-	{
-		String fontConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.FONT);
-		String fontColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.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());
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	private void initForegroundFromPrefs(View view, final IPreferenceStore store, String elementName)
-	{
-		String lineColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.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 = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL);
-		String gradientColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT);
-		String gradientPolicyConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.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());
-		}
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.providers;

+

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.draw2d.ColorConstants;

+import org.eclipse.emf.ecore.EAnnotation;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EcoreFactory;

+import org.eclipse.emf.transaction.util.TransactionUtil;

+import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;

+import org.eclipse.gmf.runtime.common.core.service.IOperation;

+import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;

+import org.eclipse.gmf.runtime.diagram.core.providers.IViewProvider;

+import org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation;

+import org.eclipse.gmf.runtime.diagram.core.services.view.CreateEdgeViewOperation;

+import org.eclipse.gmf.runtime.diagram.core.services.view.CreateNodeViewOperation;

+import org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewForKindOperation;

+import org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewOperation;

+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

+import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;

+import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

+import org.eclipse.gmf.runtime.notation.Connector;

+import org.eclipse.gmf.runtime.notation.DecorationNode;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.gmf.runtime.notation.Edge;

+import org.eclipse.gmf.runtime.notation.FillStyle;

+import org.eclipse.gmf.runtime.notation.FontStyle;

+import org.eclipse.gmf.runtime.notation.Location;

+import org.eclipse.gmf.runtime.notation.MeasurementUnit;

+import org.eclipse.gmf.runtime.notation.Node;

+import org.eclipse.gmf.runtime.notation.NotationFactory;

+import org.eclipse.gmf.runtime.notation.NotationPackage;

+import org.eclipse.gmf.runtime.notation.RelativeBendpoints;

+import org.eclipse.gmf.runtime.notation.Shape;

+import org.eclipse.gmf.runtime.notation.TitleStyle;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;

+import org.eclipse.jface.preference.IPreferenceStore;

+import org.eclipse.jface.preference.PreferenceConverter;

+import org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType;

+import org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils;

+import org.eclipse.papyrus.infra.gmfdiag.common.preferences.PreferencesConstantsHelper;

+import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.GradientPreferenceConverter;

+import org.eclipse.papyrus.uml.diagram.common.helper.PreferenceInitializerForElementHelper;

+import org.eclipse.papyrus.uml.diagram.composite.edit.parts.*;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.graphics.FontData;

+

+/**

+ * @generated

+ */

+public class UMLViewProvider extends AbstractProvider implements IViewProvider {

+

+	/**

+	 * @generated

+	 */

+	public final boolean provides(IOperation 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);

+		}

+		return false;

+	}

+

+	/**

+	 * @generated

+	 */

+	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;

+		 */

+

+		// check Diagram Type should be the class diagram

+		String modelID = UMLVisualIDRegistry.getModelID(op.getContainerView());

+		if(!getDiagramProvidedId().equals(modelID)) {

+			return false;

+		}

+

+		int visualID = UMLVisualIDRegistry.getVisualID(op.getSemanticHint());

+		if(Node.class.isAssignableFrom(op.getViewKind())) {

+			return UMLVisualIDRegistry.canCreateNode(op.getContainerView(), visualID);

+		}

+

+		return true;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected String getDiagramProvidedId() {

+		/*

+		 * Indicates for which diagram this provider works for.

+		 * <p>

+		 * This method can be overloaded when diagram editor inherits from another one, but should never be <code>null</code>

+		 * </p>

+		 * 

+		 * @return the unique identifier of the diagram for which views are provided.

+		 */

+		return CompositeStructureDiagramEditPart.MODEL_ID;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean provides(CreateDiagramViewOperation op) {

+		return CompositeStructureDiagramEditPart.MODEL_ID.equals(op.getSemanticHint()) && UMLVisualIDRegistry.getDiagramVisualID(getSemanticElement(op.getSemanticAdapter())) != -1;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean provides(CreateNodeViewOperation op) {

+		if(op.getContainerView() == null) {

+			return false;

+		}

+		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());

+		EObject domainElement = getSemanticElement(op.getSemanticAdapter());

+		int visualID;

+		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) {

+				return false;

+			}

+			visualID = UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement);

+		} else {

+			visualID = UMLVisualIDRegistry.getVisualID(op.getSemanticHint());

+			if(elementType != null) {

+				if(elementType instanceof IExtendedHintedElementType) {

+					if(domainElement != null) {

+						if(!UMLVisualIDRegistry.checkNodeVisualID(op.getContainerView(), domainElement, visualID)) {

+							return false;

+						}

+					}

+				} else {

+					if(!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {

+						return false; // foreign element type

+					}

+				}

+				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)) {

+					return false; // visual id for node EClass should match visual id from element type

+				}

+			} else {

+				if(!CompositeStructureDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(op.getContainerView()))) {

+					return false; // foreign diagram

+				}

+				switch(visualID) {

+				case BehaviorPortEditPart.VISUAL_ID:

+					break; // pure design element

+				case ActivityCompositeEditPart.VISUAL_ID:

+				case InteractionCompositeEditPart.VISUAL_ID:

+				case ProtocolStateMachineCompositeEditPart.VISUAL_ID:

+				case StateMachineCompositeEditPart.VISUAL_ID:

+				case FunctionBehaviorCompositeEditPart.VISUAL_ID:

+				case OpaqueBehaviorCompositeEditPart.VISUAL_ID:

+				case ComponentCompositeEditPart.VISUAL_ID:

+				case DeviceCompositeEditPart.VISUAL_ID:

+				case ExecutionEnvironmentCompositeEditPart.VISUAL_ID:

+				case NodeCompositeEditPart.VISUAL_ID:

+				case ClassCompositeEditPart.VISUAL_ID:

+				case PrimitiveTypeEditPart.VISUAL_ID:

+				case EnumerationEditPart.VISUAL_ID:

+				case DataTypeEditPart.VISUAL_ID:

+				case SignalEventEditPart.VISUAL_ID:

+				case CallEventEditPart.VISUAL_ID:

+				case AnyReceiveEventEditPart.VISUAL_ID:

+				case ChangeEventEditPart.VISUAL_ID:

+				case TimeEventEditPart.VISUAL_ID:

+				case DurationObservationEditPart.VISUAL_ID:

+				case TimeObservationEditPart.VISUAL_ID:

+				case LiteralBooleanEditPart.VISUAL_ID:

+				case LiteralIntegerEditPart.VISUAL_ID:

+				case LiteralNullEditPart.VISUAL_ID:

+				case LiteralStringEditPart.VISUAL_ID:

+				case LiteralUnlimitedNaturalEditPart.VISUAL_ID:

+				case StringExpressionEditPart.VISUAL_ID:

+				case OpaqueExpressionEditPart.VISUAL_ID:

+				case TimeExpressionEditPart.VISUAL_ID:

+				case ExpressionEditPart.VISUAL_ID:

+				case DurationEditPart.VISUAL_ID:

+				case TimeIntervalEditPart.VISUAL_ID:

+				case DurationIntervalEditPart.VISUAL_ID:

+				case IntervalEditPart.VISUAL_ID:

+				case InstanceValueEditPart.VISUAL_ID:

+				case TimeConstraintEditPart.VISUAL_ID:

+				case IntervalConstraintEditPart.VISUAL_ID:

+				case InteractionConstraintEditPart.VISUAL_ID:

+				case ConstraintEditPart.VISUAL_ID:

+				case PortEditPart.VISUAL_ID:

+				case ParameterEditPart.VISUAL_ID:

+				case PropertyPartEditPartCN.VISUAL_ID:

+				case CollaborationRoleEditPartCN.VISUAL_ID:

+				case CollaborationUseEditPartCN.VISUAL_ID:

+				case CollaborationCompositeEditPartCN.VISUAL_ID:

+				case InterfaceEditPartCN.VISUAL_ID:

+				case ActorEditPartCN.VISUAL_ID:

+				case DeploymentSpecificationEditPartCN.VISUAL_ID:

+				case ArtifactEditPartCN.VISUAL_ID:

+				case InformationItemEditPartCN.VISUAL_ID:

+				case SignalEditPartCN.VISUAL_ID:

+				case UseCaseEditPartCN.VISUAL_ID:

+				case CommentEditPartCN.VISUAL_ID:

+				case EnumerationLiteralEditPartCLN.VISUAL_ID:

+				case CollaborationCompositeEditPart.VISUAL_ID:

+				case InterfaceEditPart.VISUAL_ID:

+				case ActorEditPart.VISUAL_ID:

+				case DeploymentSpecificationEditPart.VISUAL_ID:

+				case ArtifactEditPart.VISUAL_ID:

+				case InformationItemEditPart.VISUAL_ID:

+				case SignalEditPart.VISUAL_ID:

+				case UseCaseEditPart.VISUAL_ID:

+				case CommentEditPart.VISUAL_ID:

+				case DurationConstraintEditPart.VISUAL_ID:

+				case ActivityCompositeEditPartCN.VISUAL_ID:

+				case InteractionCompositeEditPartCN.VISUAL_ID:

+				case ProtocolStateMachineCompositeEditPartCN.VISUAL_ID:

+				case StateMachineCompositeEditPartCN.VISUAL_ID:

+				case FunctionBehaviorCompositeEditPartCN.VISUAL_ID:

+				case OpaqueBehaviorCompositeEditPartCN.VISUAL_ID:

+				case ComponentCompositeEditPartCN.VISUAL_ID:

+				case DeviceCompositeEditPartCN.VISUAL_ID:

+				case ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID:

+				case NodeCompositeEditPartCN.VISUAL_ID:

+				case ClassCompositeEditPartCN.VISUAL_ID:

+				case PrimitiveTypeEditPartCN.VISUAL_ID:

+				case EnumerationEditPartCN.VISUAL_ID:

+				case DataTypeEditPartCN.VISUAL_ID:

+				case DurationConstraintEditPartCN.VISUAL_ID:

+				case TimeConstraintEditPartCN.VISUAL_ID:

+				case IntervalConstraintEditPartCN.VISUAL_ID:

+				case InteractionConstraintEditPartCN.VISUAL_ID:

+				case ConstraintEditPartCN.VISUAL_ID:

+				case PropertyEditPartCLN.VISUAL_ID:

+				case OperationEditPartCLN.VISUAL_ID:

+					if(domainElement == null || visualID != UMLVisualIDRegistry.getNodeVisualID(op.getContainerView(), domainElement)) {

+						return false; // visual id in semantic hint should match visual id for domain element

+					}

+					break;

+				default:

+					return false;

+				}

+			}

+		}

+		return ActivityCompositeEditPart.VISUAL_ID == visualID || InteractionCompositeEditPart.VISUAL_ID == visualID || ProtocolStateMachineCompositeEditPart.VISUAL_ID == visualID || StateMachineCompositeEditPart.VISUAL_ID == visualID || FunctionBehaviorCompositeEditPart.VISUAL_ID == visualID || OpaqueBehaviorCompositeEditPart.VISUAL_ID == visualID || ComponentCompositeEditPart.VISUAL_ID == visualID || DeviceCompositeEditPart.VISUAL_ID == visualID || ExecutionEnvironmentCompositeEditPart.VISUAL_ID == visualID || NodeCompositeEditPart.VISUAL_ID == visualID || ClassCompositeEditPart.VISUAL_ID == visualID || CollaborationCompositeEditPart.VISUAL_ID == visualID || InterfaceEditPart.VISUAL_ID == visualID || PrimitiveTypeEditPart.VISUAL_ID == visualID || EnumerationEditPart.VISUAL_ID == visualID || DataTypeEditPart.VISUAL_ID == visualID || ActorEditPart.VISUAL_ID == visualID || DeploymentSpecificationEditPart.VISUAL_ID == visualID || ArtifactEditPart.VISUAL_ID == visualID || InformationItemEditPart.VISUAL_ID == visualID || SignalEditPart.VISUAL_ID == visualID || UseCaseEditPart.VISUAL_ID == visualID || SignalEventEditPart.VISUAL_ID == visualID || CallEventEditPart.VISUAL_ID == visualID || AnyReceiveEventEditPart.VISUAL_ID == visualID || ChangeEventEditPart.VISUAL_ID == visualID || TimeEventEditPart.VISUAL_ID == visualID || DurationObservationEditPart.VISUAL_ID == visualID || TimeObservationEditPart.VISUAL_ID == visualID || LiteralBooleanEditPart.VISUAL_ID == visualID || LiteralIntegerEditPart.VISUAL_ID == visualID || LiteralNullEditPart.VISUAL_ID == visualID || LiteralStringEditPart.VISUAL_ID == visualID || LiteralUnlimitedNaturalEditPart.VISUAL_ID == visualID || StringExpressionEditPart.VISUAL_ID == visualID || OpaqueExpressionEditPart.VISUAL_ID == visualID || TimeExpressionEditPart.VISUAL_ID == visualID || ExpressionEditPart.VISUAL_ID == visualID || DurationEditPart.VISUAL_ID == visualID || TimeIntervalEditPart.VISUAL_ID == visualID || DurationIntervalEditPart.VISUAL_ID == visualID || IntervalEditPart.VISUAL_ID == visualID || InstanceValueEditPart.VISUAL_ID == visualID || CommentEditPart.VISUAL_ID == visualID || DurationConstraintEditPart.VISUAL_ID == visualID || TimeConstraintEditPart.VISUAL_ID == visualID || IntervalConstraintEditPart.VISUAL_ID == visualID || InteractionConstraintEditPart.VISUAL_ID == visualID || ConstraintEditPart.VISUAL_ID == visualID || BehaviorPortEditPart.VISUAL_ID == visualID || PortEditPart.VISUAL_ID == visualID || ParameterEditPart.VISUAL_ID == visualID || PropertyPartEditPartCN.VISUAL_ID == visualID || CollaborationRoleEditPartCN.VISUAL_ID == visualID || CollaborationUseEditPartCN.VISUAL_ID == visualID || ActivityCompositeEditPartCN.VISUAL_ID == visualID || InteractionCompositeEditPartCN.VISUAL_ID == visualID || ProtocolStateMachineCompositeEditPartCN.VISUAL_ID == visualID || StateMachineCompositeEditPartCN.VISUAL_ID == visualID || FunctionBehaviorCompositeEditPartCN.VISUAL_ID == visualID || OpaqueBehaviorCompositeEditPartCN.VISUAL_ID == visualID || ComponentCompositeEditPartCN.VISUAL_ID == visualID || DeviceCompositeEditPartCN.VISUAL_ID == visualID || ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID == visualID || NodeCompositeEditPartCN.VISUAL_ID == visualID || ClassCompositeEditPartCN.VISUAL_ID == visualID || CollaborationCompositeEditPartCN.VISUAL_ID == visualID || InterfaceEditPartCN.VISUAL_ID == visualID || PrimitiveTypeEditPartCN.VISUAL_ID == visualID || EnumerationEditPartCN.VISUAL_ID == visualID || DataTypeEditPartCN.VISUAL_ID == visualID || ActorEditPartCN.VISUAL_ID == visualID || DeploymentSpecificationEditPartCN.VISUAL_ID == visualID || ArtifactEditPartCN.VISUAL_ID == visualID || InformationItemEditPartCN.VISUAL_ID == visualID || SignalEditPartCN.VISUAL_ID == visualID || UseCaseEditPartCN.VISUAL_ID == visualID || CommentEditPartCN.VISUAL_ID == visualID || DurationConstraintEditPartCN.VISUAL_ID == visualID || TimeConstraintEditPartCN.VISUAL_ID == visualID || IntervalConstraintEditPartCN.VISUAL_ID == visualID || InteractionConstraintEditPartCN.VISUAL_ID == visualID || ConstraintEditPartCN.VISUAL_ID == visualID || PropertyEditPartCLN.VISUAL_ID == visualID || OperationEditPartCLN.VISUAL_ID == visualID || EnumerationLiteralEditPartCLN.VISUAL_ID == visualID;

+

+

+	}

+

+	/**

+	 * @generated

+	 */

+	protected boolean provides(CreateEdgeViewOperation op) {

+		IElementType elementType = getSemanticElementType(op.getSemanticAdapter());

+		//RS: add code for extended types creation

+		if(elementType instanceof IExtendedHintedElementType) {

+			IElementType closestNonExtendedType = ElementTypeUtils.getClosestDiagramType(elementType);

+			if(!UMLElementTypes.isKnownElementType(closestNonExtendedType) || (!(closestNonExtendedType instanceof IHintedType))) {

+				return false; // foreign element type.

+			}

+		} else {

+			if(!UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof IHintedType))) {

+				return false; // foreign element type

+			}

+		}

+		//if (!org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes.isKnownElementType(elementType) || (!(elementType instanceof org.eclipse.gmf.runtime.emf.type.core.IHintedType))) {

+		//	return false; // foreign element type

+		//}

+		// END R.S.

+		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)) {

+			return false; // visual id for link EClass should match visual id from element type

+		}

+		return true;

+	}

+

+	/**

+	 * @generated

+	 */

+	@SuppressWarnings("unchecked")

+	public Diagram createDiagram(IAdaptable semanticAdapter, String diagramKind, PreferencesHint preferencesHint) {

+		Diagram diagram = NotationFactory.eINSTANCE.createDiagram();

+		diagram.getStyles().add(NotationFactory.eINSTANCE.createDiagramStyle());

+		diagram.setType(CompositeStructureDiagramEditPart.MODEL_ID);

+		diagram.setElement(getSemanticElement(semanticAdapter));

+		diagram.setMeasurementUnit(MeasurementUnit.PIXEL_LITERAL);

+		return diagram;

+	}

+

+	/**

+	 * @generated

+	 */

+	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);

+		} else {

+			visualID = UMLVisualIDRegistry.getVisualID(semanticHint);

+		}

+		switch(visualID) {

+		case ActivityCompositeEditPart.VISUAL_ID:

+			return createActivity_2060(domainElement, containerView, index, persisted, preferencesHint);

+		case InteractionCompositeEditPart.VISUAL_ID:

+			return createInteraction_2061(domainElement, containerView, index, persisted, preferencesHint);

+		case ProtocolStateMachineCompositeEditPart.VISUAL_ID:

+			return createProtocolStateMachine_2062(domainElement, containerView, index, persisted, preferencesHint);

+		case StateMachineCompositeEditPart.VISUAL_ID:

+			return createStateMachine_2063(domainElement, containerView, index, persisted, preferencesHint);

+		case FunctionBehaviorCompositeEditPart.VISUAL_ID:

+			return createFunctionBehavior_2064(domainElement, containerView, index, persisted, preferencesHint);

+		case OpaqueBehaviorCompositeEditPart.VISUAL_ID:

+			return createOpaqueBehavior_2065(domainElement, containerView, index, persisted, preferencesHint);

+		case ComponentCompositeEditPart.VISUAL_ID:

+			return createComponent_2069(domainElement, containerView, index, persisted, preferencesHint);

+		case DeviceCompositeEditPart.VISUAL_ID:

+			return createDevice_2070(domainElement, containerView, index, persisted, preferencesHint);

+		case ExecutionEnvironmentCompositeEditPart.VISUAL_ID:

+			return createExecutionEnvironment_2071(domainElement, containerView, index, persisted, preferencesHint);

+		case NodeCompositeEditPart.VISUAL_ID:

+			return createNode_2072(domainElement, containerView, index, persisted, preferencesHint);

+		case ClassCompositeEditPart.VISUAL_ID:

+			return createClass_2073(domainElement, containerView, index, persisted, preferencesHint);

+		case CollaborationCompositeEditPart.VISUAL_ID:

+			return createCollaboration_2075(domainElement, containerView, index, persisted, preferencesHint);

+		case InterfaceEditPart.VISUAL_ID:

+			return createInterface_2076(domainElement, containerView, index, persisted, preferencesHint);

+		case PrimitiveTypeEditPart.VISUAL_ID:

+			return createPrimitiveType_2066(domainElement, containerView, index, persisted, preferencesHint);

+		case EnumerationEditPart.VISUAL_ID:

+			return createEnumeration_2067(domainElement, containerView, index, persisted, preferencesHint);

+		case DataTypeEditPart.VISUAL_ID:

+			return createDataType_2068(domainElement, containerView, index, persisted, preferencesHint);

+		case ActorEditPart.VISUAL_ID:

+			return createActor_2077(domainElement, containerView, index, persisted, preferencesHint);

+		case DeploymentSpecificationEditPart.VISUAL_ID:

+			return createDeploymentSpecification_2078(domainElement, containerView, index, persisted, preferencesHint);

+		case ArtifactEditPart.VISUAL_ID:

+			return createArtifact_2079(domainElement, containerView, index, persisted, preferencesHint);

+		case InformationItemEditPart.VISUAL_ID:

+			return createInformationItem_2080(domainElement, containerView, index, persisted, preferencesHint);

+		case SignalEditPart.VISUAL_ID:

+			return createSignal_2081(domainElement, containerView, index, persisted, preferencesHint);

+		case UseCaseEditPart.VISUAL_ID:

+			return createUseCase_2082(domainElement, containerView, index, persisted, preferencesHint);

+		case SignalEventEditPart.VISUAL_ID:

+			return createSignalEvent_2083(domainElement, containerView, index, persisted, preferencesHint);

+		case CallEventEditPart.VISUAL_ID:

+			return createCallEvent_2084(domainElement, containerView, index, persisted, preferencesHint);

+		case AnyReceiveEventEditPart.VISUAL_ID:

+			return createAnyReceiveEvent_2085(domainElement, containerView, index, persisted, preferencesHint);

+		case ChangeEventEditPart.VISUAL_ID:

+			return createChangeEvent_2088(domainElement, containerView, index, persisted, preferencesHint);

+		case TimeEventEditPart.VISUAL_ID:

+			return createTimeEvent_2089(domainElement, containerView, index, persisted, preferencesHint);

+		case DurationObservationEditPart.VISUAL_ID:

+			return createDurationObservation_2093(domainElement, containerView, index, persisted, preferencesHint);

+		case TimeObservationEditPart.VISUAL_ID:

+			return createTimeObservation_2094(domainElement, containerView, index, persisted, preferencesHint);

+		case LiteralBooleanEditPart.VISUAL_ID:

+			return createLiteralBoolean_2095(domainElement, containerView, index, persisted, preferencesHint);

+		case LiteralIntegerEditPart.VISUAL_ID:

+			return createLiteralInteger_2096(domainElement, containerView, index, persisted, preferencesHint);

+		case LiteralNullEditPart.VISUAL_ID:

+			return createLiteralNull_2097(domainElement, containerView, index, persisted, preferencesHint);

+		case LiteralStringEditPart.VISUAL_ID:

+			return createLiteralString_2098(domainElement, containerView, index, persisted, preferencesHint);

+		case LiteralUnlimitedNaturalEditPart.VISUAL_ID:

+			return createLiteralUnlimitedNatural_2099(domainElement, containerView, index, persisted, preferencesHint);

+		case StringExpressionEditPart.VISUAL_ID:

+			return createStringExpression_2100(domainElement, containerView, index, persisted, preferencesHint);

+		case OpaqueExpressionEditPart.VISUAL_ID:

+			return createOpaqueExpression_2101(domainElement, containerView, index, persisted, preferencesHint);

+		case TimeExpressionEditPart.VISUAL_ID:

+			return createTimeExpression_2102(domainElement, containerView, index, persisted, preferencesHint);

+		case ExpressionEditPart.VISUAL_ID:

+			return createExpression_2103(domainElement, containerView, index, persisted, preferencesHint);

+		case DurationEditPart.VISUAL_ID:

+			return createDuration_2104(domainElement, containerView, index, persisted, preferencesHint);

+		case TimeIntervalEditPart.VISUAL_ID:

+			return createTimeInterval_2105(domainElement, containerView, index, persisted, preferencesHint);

+		case DurationIntervalEditPart.VISUAL_ID:

+			return createDurationInterval_2106(domainElement, containerView, index, persisted, preferencesHint);

+		case IntervalEditPart.VISUAL_ID:

+			return createInterval_2107(domainElement, containerView, index, persisted, preferencesHint);

+		case InstanceValueEditPart.VISUAL_ID:

+			return createInstanceValue_2108(domainElement, containerView, index, persisted, preferencesHint);

+		case CommentEditPart.VISUAL_ID:

+			return createComment_2109(domainElement, containerView, index, persisted, preferencesHint);

+		case DurationConstraintEditPart.VISUAL_ID:

+			return createDurationConstraint_2110(domainElement, containerView, index, persisted, preferencesHint);

+		case TimeConstraintEditPart.VISUAL_ID:

+			return createTimeConstraint_2111(domainElement, containerView, index, persisted, preferencesHint);

+		case IntervalConstraintEditPart.VISUAL_ID:

+			return createIntervalConstraint_2112(domainElement, containerView, index, persisted, preferencesHint);

+		case InteractionConstraintEditPart.VISUAL_ID:

+			return createInteractionConstraint_2113(domainElement, containerView, index, persisted, preferencesHint);

+		case ConstraintEditPart.VISUAL_ID:

+			return createConstraint_2114(domainElement, containerView, index, persisted, preferencesHint);

+		case BehaviorPortEditPart.VISUAL_ID:

+			return createNode_3121(domainElement, containerView, index, persisted, preferencesHint);

+		case PortEditPart.VISUAL_ID:

+			return createPort_3069(domainElement, containerView, index, persisted, preferencesHint);

+		case ParameterEditPart.VISUAL_ID:

+			return createParameter_3088(domainElement, containerView, index, persisted, preferencesHint);

+		case PropertyPartEditPartCN.VISUAL_ID:

+			return createProperty_3070(domainElement, containerView, index, persisted, preferencesHint);

+		case CollaborationRoleEditPartCN.VISUAL_ID:

+			return createConnectableElement_3115(domainElement, containerView, index, persisted, preferencesHint);

+		case CollaborationUseEditPartCN.VISUAL_ID:

+			return createCollaborationUse_3071(domainElement, containerView, index, persisted, preferencesHint);

+		case ActivityCompositeEditPartCN.VISUAL_ID:

+			return createActivity_3072(domainElement, containerView, index, persisted, preferencesHint);

+		case InteractionCompositeEditPartCN.VISUAL_ID:

+			return createInteraction_3073(domainElement, containerView, index, persisted, preferencesHint);

+		case ProtocolStateMachineCompositeEditPartCN.VISUAL_ID:

+			return createProtocolStateMachine_3074(domainElement, containerView, index, persisted, preferencesHint);

+		case StateMachineCompositeEditPartCN.VISUAL_ID:

+			return createStateMachine_3075(domainElement, containerView, index, persisted, preferencesHint);

+		case FunctionBehaviorCompositeEditPartCN.VISUAL_ID:

+			return createFunctionBehavior_3076(domainElement, containerView, index, persisted, preferencesHint);

+		case OpaqueBehaviorCompositeEditPartCN.VISUAL_ID:

+			return createOpaqueBehavior_3077(domainElement, containerView, index, persisted, preferencesHint);

+		case ComponentCompositeEditPartCN.VISUAL_ID:

+			return createComponent_3081(domainElement, containerView, index, persisted, preferencesHint);

+		case DeviceCompositeEditPartCN.VISUAL_ID:

+			return createDevice_3082(domainElement, containerView, index, persisted, preferencesHint);

+		case ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID:

+			return createExecutionEnvironment_3083(domainElement, containerView, index, persisted, preferencesHint);

+		case NodeCompositeEditPartCN.VISUAL_ID:

+			return createNode_3084(domainElement, containerView, index, persisted, preferencesHint);

+		case ClassCompositeEditPartCN.VISUAL_ID:

+			return createClass_3085(domainElement, containerView, index, persisted, preferencesHint);

+		case CollaborationCompositeEditPartCN.VISUAL_ID:

+			return createCollaboration_3086(domainElement, containerView, index, persisted, preferencesHint);

+		case InterfaceEditPartCN.VISUAL_ID:

+			return createInterface_3087(domainElement, containerView, index, persisted, preferencesHint);

+		case PrimitiveTypeEditPartCN.VISUAL_ID:

+			return createPrimitiveType_3078(domainElement, containerView, index, persisted, preferencesHint);

+		case EnumerationEditPartCN.VISUAL_ID:

+			return createEnumeration_3079(domainElement, containerView, index, persisted, preferencesHint);

+		case DataTypeEditPartCN.VISUAL_ID:

+			return createDataType_3080(domainElement, containerView, index, persisted, preferencesHint);

+		case ActorEditPartCN.VISUAL_ID:

+			return createActor_3091(domainElement, containerView, index, persisted, preferencesHint);

+		case DeploymentSpecificationEditPartCN.VISUAL_ID:

+			return createDeploymentSpecification_3092(domainElement, containerView, index, persisted, preferencesHint);

+		case ArtifactEditPartCN.VISUAL_ID:

+			return createArtifact_3093(domainElement, containerView, index, persisted, preferencesHint);

+		case InformationItemEditPartCN.VISUAL_ID:

+			return createInformationItem_3094(domainElement, containerView, index, persisted, preferencesHint);

+		case SignalEditPartCN.VISUAL_ID:

+			return createSignal_3095(domainElement, containerView, index, persisted, preferencesHint);

+		case UseCaseEditPartCN.VISUAL_ID:

+			return createUseCase_3096(domainElement, containerView, index, persisted, preferencesHint);

+		case CommentEditPartCN.VISUAL_ID:

+			return createComment_3097(domainElement, containerView, index, persisted, preferencesHint);

+		case DurationConstraintEditPartCN.VISUAL_ID:

+			return createDurationConstraint_3116(domainElement, containerView, index, persisted, preferencesHint);

+		case TimeConstraintEditPartCN.VISUAL_ID:

+			return createTimeConstraint_3117(domainElement, containerView, index, persisted, preferencesHint);

+		case IntervalConstraintEditPartCN.VISUAL_ID:

+			return createIntervalConstraint_3118(domainElement, containerView, index, persisted, preferencesHint);

+		case InteractionConstraintEditPartCN.VISUAL_ID:

+			return createInteractionConstraint_3119(domainElement, containerView, index, persisted, preferencesHint);

+		case ConstraintEditPartCN.VISUAL_ID:

+			return createConstraint_3120(domainElement, containerView, index, persisted, preferencesHint);

+		case PropertyEditPartCLN.VISUAL_ID:

+			return createProperty_3101(domainElement, containerView, index, persisted, preferencesHint);

+		case OperationEditPartCLN.VISUAL_ID:

+			return createOperation_3102(domainElement, containerView, index, persisted, preferencesHint);

+		case EnumerationLiteralEditPartCLN.VISUAL_ID:

+			return createEnumerationLiteral_3066(domainElement, containerView, index, persisted, preferencesHint);

+		}

+		// can't happen, provided #provides(CreateNodeViewOperation) is correct

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	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)) {

+		case BehaviorPortLinkEditPart.VISUAL_ID:

+			return createLink_4022(containerView, index, persisted, preferencesHint);

+		case LinkDescriptorEditPart.VISUAL_ID:

+			return createLink_4001(containerView, index, persisted, preferencesHint);

+		case CommentAnnotatedElementEditPart.VISUAL_ID:

+			return createCommentAnnotatedElement_4002(containerView, index, persisted, preferencesHint);

+		case ConstraintConstrainedElementEditPart.VISUAL_ID:

+			return createConstraintConstrainedElement_4003(containerView, index, persisted, preferencesHint);

+		case ComponentRealizationEditPart.VISUAL_ID:

+			return createComponentRealization_4004(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+		case InterfaceRealizationEditPart.VISUAL_ID:

+			return createInterfaceRealization_4005(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+		case SubstitutionEditPart.VISUAL_ID:

+			return createSubstitution_4011(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+		case RealizationEditPart.VISUAL_ID:

+			return createRealization_4006(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+		case ManifestationEditPart.VISUAL_ID:

+			return createManifestation_4012(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+		case AbstractionEditPart.VISUAL_ID:

+			return createAbstraction_4007(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+		case UsageEditPart.VISUAL_ID:

+			return createUsage_4008(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+		case DeploymentEditPart.VISUAL_ID:

+			return createDeployment_4009(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+		case RoleBindingEditPart.VISUAL_ID:

+			return createDependency_4017(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+		case DependencyEditPart.VISUAL_ID:

+			return createDependency_4010(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+		case ConnectorEditPart.VISUAL_ID:

+			return createConnector_4013(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+		case GeneralizationEditPart.VISUAL_ID:

+			return createGeneralization_4015(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+		case TimeObservationEventEditPart.VISUAL_ID:

+			return createTimeObservationEvent_4018(containerView, index, persisted, preferencesHint);

+		case DurationObservationEventEditPart.VISUAL_ID:

+			return createDurationObservationEvent_4019(containerView, index, persisted, preferencesHint);

+		case RepresentationEditPart.VISUAL_ID:

+			return createInformationItemRepresented_4020(containerView, index, persisted, preferencesHint);

+		case InformationFlowEditPart.VISUAL_ID:

+			return createInformationFlow_4021(getSemanticElement(semanticAdapter), containerView, index, persisted, preferencesHint);

+		}

+		// can never happen, provided #provides(CreateEdgeViewOperation) is correct

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createActivity_2060(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(ActivityCompositeEditPart.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, "Activity");

+		Node label5112 = createLabel(node, UMLVisualIDRegistry.getType(ActivityCompositeNameEditPart.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(ActivityCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Activity");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createInteraction_2061(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(InteractionCompositeEditPart.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, "Interaction");

+		Node label5113 = createLabel(node, UMLVisualIDRegistry.getType(InteractionCompositeNameEditPart.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(InteractionCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Interaction");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createProtocolStateMachine_2062(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeEditPart.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, "ProtocolStateMachine");

+		Node label5114 = createLabel(node, UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeNameEditPart.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "ProtocolStateMachine");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createStateMachine_2063(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(StateMachineCompositeEditPart.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, "StateMachine");

+		Node label5115 = createLabel(node, UMLVisualIDRegistry.getType(StateMachineCompositeNameEditPart.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(StateMachineCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "StateMachine");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createFunctionBehavior_2064(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(FunctionBehaviorCompositeEditPart.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, "FunctionBehavior");

+		Node label5116 = createLabel(node, UMLVisualIDRegistry.getType(FunctionBehaviorCompositeNameEditPart.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(FunctionBehaviorCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "FunctionBehavior");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createOpaqueBehavior_2065(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeEditPart.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, "OpaqueBehavior");

+		Node label5117 = createLabel(node, UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeNameEditPart.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "OpaqueBehavior");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createComponent_2069(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(ComponentCompositeEditPart.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, "Component");

+		Node label5121 = createLabel(node, UMLVisualIDRegistry.getType(ComponentCompositeNameEditPart.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(ComponentCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Component");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createDevice_2070(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(DeviceCompositeEditPart.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, "Device");

+		Node label5122 = createLabel(node, UMLVisualIDRegistry.getType(DeviceCompositeNameEditPart.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(DeviceCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Device");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createExecutionEnvironment_2071(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeEditPart.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, "ExecutionEnvironment");

+		Node label5123 = createLabel(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeNameEditPart.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "ExecutionEnvironment");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createNode_2072(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(NodeCompositeEditPart.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, "Node");

+		Node label5124 = createLabel(node, UMLVisualIDRegistry.getType(NodeCompositeNameEditPart.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(NodeCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Node");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createClass_2073(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(ClassCompositeEditPart.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, "Class");

+		Node label5156 = createLabel(node, UMLVisualIDRegistry.getType(ClassCompositeNameEditPart.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(ClassCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Class");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createCollaboration_2075(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(CollaborationCompositeEditPart.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, "Collaboration");

+		Node label5158 = createLabel(node, UMLVisualIDRegistry.getType(CollaborationCompositeNameEditPart.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(CollaborationCompositeCompartmentEditPart.VISUAL_ID), true, true, false, false);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Collaboration");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createInterface_2076(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(InterfaceEditPart.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, "Interface");

+		Node label5159 = createLabel(node, UMLVisualIDRegistry.getType(InterfaceNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createPrimitiveType_2066(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(PrimitiveTypeEditPart.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, "PrimitiveType");

+		Node label5118 = createLabel(node, UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createEnumeration_2067(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(EnumerationEditPart.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, "Enumeration");

+		Node label5119 = createLabel(node, UMLVisualIDRegistry.getType(EnumerationNameEditPart.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID), true, true, true, true);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Enumeration");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createDataType_2068(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(DataTypeEditPart.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, "DataType");

+		Node label5120 = createLabel(node, UMLVisualIDRegistry.getType(DataTypeNameEditPart.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPart.VISUAL_ID), true, true, true, true);

+		createCompartment(node, UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPart.VISUAL_ID), true, true, true, true);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "DataType");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createActor_2077(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(ActorEditPart.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, "Actor");

+		Node label5160 = createLabel(node, UMLVisualIDRegistry.getType(ActorNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createDeploymentSpecification_2078(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(DeploymentSpecificationEditPart.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, "DeploymentSpecification");

+		Node label5161 = createLabel(node, UMLVisualIDRegistry.getType(DeploymentSpecificationNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createArtifact_2079(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(ArtifactEditPart.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, "Artifact");

+		Node label5162 = createLabel(node, UMLVisualIDRegistry.getType(ArtifactNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createInformationItem_2080(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(InformationItemEditPart.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, "InformationItem");

+		Node label5163 = createLabel(node, UMLVisualIDRegistry.getType(InformationItemNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSignal_2081(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(SignalEditPart.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, "Signal");

+		Node label5164 = createLabel(node, UMLVisualIDRegistry.getType(SignalNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createUseCase_2082(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(UseCaseEditPart.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, "UseCase");

+		Node label5165 = createLabel(node, UMLVisualIDRegistry.getType(UseCaseNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSignalEvent_2083(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(SignalEventEditPart.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, "SignalEvent");

+		Node label5166 = createLabel(node, UMLVisualIDRegistry.getType(SignalEventNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createCallEvent_2084(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(CallEventEditPart.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, "CallEvent");

+		Node label5167 = createLabel(node, UMLVisualIDRegistry.getType(CallEventNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createAnyReceiveEvent_2085(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(AnyReceiveEventEditPart.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, "AnyReceiveEvent");

+		Node label5168 = createLabel(node, UMLVisualIDRegistry.getType(AnyReceiveEventNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createChangeEvent_2088(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(ChangeEventEditPart.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, "ChangeEvent");

+		Node label5171 = createLabel(node, UMLVisualIDRegistry.getType(ChangeEventNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createTimeEvent_2089(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(TimeEventEditPart.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, "TimeEvent");

+		Node label5172 = createLabel(node, UMLVisualIDRegistry.getType(TimeEventNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createDurationObservation_2093(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(DurationObservationEditPart.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, "DurationObservation");

+		Node label5151 = createLabel(node, UMLVisualIDRegistry.getType(DurationObservationNameEditPart.VISUAL_ID));

+		label5151.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location5151 = (Location)label5151.getLayoutConstraint();

+		location5151.setX(25);

+		location5151.setY(3);

+		Node label5152 = createLabel(node, UMLVisualIDRegistry.getType(DurationObservationStereotypeLabelEditPart.VISUAL_ID));

+		label5152.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location5152 = (Location)label5152.getLayoutConstraint();

+		location5152.setX(25);

+		location5152.setY(-10);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createTimeObservation_2094(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(TimeObservationEditPart.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, "TimeObservation");

+		Node label5142 = createLabel(node, UMLVisualIDRegistry.getType(TimeObservationNameEditPart.VISUAL_ID));

+		label5142.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location5142 = (Location)label5142.getLayoutConstraint();

+		location5142.setX(25);

+		location5142.setY(3);

+		Node label5143 = createLabel(node, UMLVisualIDRegistry.getType(TimeObservationStereotypeLabelEditPart.VISUAL_ID));

+		label5143.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location5143 = (Location)label5143.getLayoutConstraint();

+		location5143.setX(25);

+		location5143.setY(-10);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createLiteralBoolean_2095(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(LiteralBooleanEditPart.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, "LiteralBoolean");

+		Node label5178 = createLabel(node, UMLVisualIDRegistry.getType(LiteralBooleanNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createLiteralInteger_2096(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(LiteralIntegerEditPart.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, "LiteralInteger");

+		Node label5179 = createLabel(node, UMLVisualIDRegistry.getType(LiteralIntegerNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createLiteralNull_2097(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(LiteralNullEditPart.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, "LiteralNull");

+		Node label5180 = createLabel(node, UMLVisualIDRegistry.getType(LiteralNullNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createLiteralString_2098(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(LiteralStringEditPart.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, "LiteralString");

+		Node label5181 = createLabel(node, UMLVisualIDRegistry.getType(LiteralStringNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createLiteralUnlimitedNatural_2099(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(LiteralUnlimitedNaturalEditPart.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, "LiteralUnlimitedNatural");

+		Node label5182 = createLabel(node, UMLVisualIDRegistry.getType(LiteralUnlimitedNaturalNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createStringExpression_2100(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(StringExpressionEditPart.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, "StringExpression");

+		Node label5183 = createLabel(node, UMLVisualIDRegistry.getType(StringExpressionNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createOpaqueExpression_2101(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(OpaqueExpressionEditPart.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, "OpaqueExpression");

+		Node label5184 = createLabel(node, UMLVisualIDRegistry.getType(OpaqueExpressionNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createTimeExpression_2102(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(TimeExpressionEditPart.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, "TimeExpression");

+		Node label5185 = createLabel(node, UMLVisualIDRegistry.getType(TimeExpressionNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createExpression_2103(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(ExpressionEditPart.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, "Expression");

+		Node label5186 = createLabel(node, UMLVisualIDRegistry.getType(ExpressionNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createDuration_2104(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(DurationEditPart.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, "Duration");

+		Node label5187 = createLabel(node, UMLVisualIDRegistry.getType(DurationNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createTimeInterval_2105(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(TimeIntervalEditPart.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, "TimeInterval");

+		Node label5188 = createLabel(node, UMLVisualIDRegistry.getType(TimeIntervalNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createDurationInterval_2106(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(DurationIntervalEditPart.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, "DurationInterval");

+		Node label5189 = createLabel(node, UMLVisualIDRegistry.getType(DurationIntervalNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createInterval_2107(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(IntervalEditPart.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, "Interval");

+		Node label5190 = createLabel(node, UMLVisualIDRegistry.getType(IntervalNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createInstanceValue_2108(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(InstanceValueEditPart.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, "InstanceValue");

+		Node label5191 = createLabel(node, UMLVisualIDRegistry.getType(InstanceValueNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createComment_2109(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(CommentEditPart.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, "Comment");

+		Node label5192 = createLabel(node, UMLVisualIDRegistry.getType(CommentBodyEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createDurationConstraint_2110(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(DurationConstraintEditPart.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, "DurationConstraint");

+		Node label5193 = createLabel(node, UMLVisualIDRegistry.getType(DurationConstraintNameEditPart.VISUAL_ID));

+		Node label6035 = createLabel(node, UMLVisualIDRegistry.getType(DurationConstraintSpecificationEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createTimeConstraint_2111(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(TimeConstraintEditPart.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, "TimeConstraint");

+		Node label5194 = createLabel(node, UMLVisualIDRegistry.getType(TimeConstraintNameEditPart.VISUAL_ID));

+		Node label6036 = createLabel(node, UMLVisualIDRegistry.getType(TimeConstraintSpecificationEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createIntervalConstraint_2112(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(IntervalConstraintEditPart.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, "IntervalConstraint");

+		Node label5195 = createLabel(node, UMLVisualIDRegistry.getType(IntervalConstraintNameEditPart.VISUAL_ID));

+		Node label6037 = createLabel(node, UMLVisualIDRegistry.getType(IntervalConstraintSpecificationEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createInteractionConstraint_2113(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(InteractionConstraintEditPart.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, "InteractionConstraint");

+		Node label5196 = createLabel(node, UMLVisualIDRegistry.getType(InteractionConstraintNameEditPart.VISUAL_ID));

+		Node label6038 = createLabel(node, UMLVisualIDRegistry.getType(InteractionConstraintSpecificationEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createConstraint_2114(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(ConstraintEditPart.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 label5197 = createLabel(node, UMLVisualIDRegistry.getType(ConstraintNameEditPart.VISUAL_ID));

+		Node label6039 = createLabel(node, UMLVisualIDRegistry.getType(ConstraintSpecificationEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createNode_3121(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(BehaviorPortEditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createPort_3069(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(PortEditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Port");

+		Node label5125 = createLabel(node, UMLVisualIDRegistry.getType(PortNameEditPart.VISUAL_ID));

+		label5125.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location5125 = (Location)label5125.getLayoutConstraint();

+		location5125.setX(25);

+		location5125.setY(3);

+		Node label6029 = createLabel(node, UMLVisualIDRegistry.getType(PortAppliedStereotypeEditPart.VISUAL_ID));

+		label6029.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6029 = (Location)label6029.getLayoutConstraint();

+		location6029.setX(25);

+		location6029.setY(-10);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createParameter_3088(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(ParameterEditPart.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Parameter");

+		Node label6033 = createLabel(node, UMLVisualIDRegistry.getType(ParameterNameEditPart.VISUAL_ID));

+		label6033.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6033 = (Location)label6033.getLayoutConstraint();

+		location6033.setX(25);

+		location6033.setY(3);

+		Node label6034 = createLabel(node, UMLVisualIDRegistry.getType(ParameterAppliedStereotypeEditPart.VISUAL_ID));

+		label6034.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6034 = (Location)label6034.getLayoutConstraint();

+		location6034.setX(25);

+		location6034.setY(-10);

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createProperty_3070(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(PropertyPartEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Property");

+		Node label5126 = createLabel(node, UMLVisualIDRegistry.getType(PropertyPartNameEditPartCN.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(PropertyPartCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Property");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createConnectableElement_3115(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(CollaborationRoleEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "CollaborationRole");

+		Node label5198 = createLabel(node, UMLVisualIDRegistry.getType(CollaborationRoleNameEditPartCN.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createCollaborationUse_3071(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(CollaborationUseEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "CollaborationUse");

+		Node label5127 = createLabel(node, UMLVisualIDRegistry.getType(CollaborationUseNameEditPart.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createActivity_3072(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(ActivityCompositeEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Activity");

+		Node label5128 = createLabel(node, UMLVisualIDRegistry.getType(ActivityCompositeNameEditPartCN.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(ActivityCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Activity");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createInteraction_3073(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(InteractionCompositeEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Interaction");

+		Node label5129 = createLabel(node, UMLVisualIDRegistry.getType(InteractionCompositeNameEditPartCN.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(InteractionCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Interaction");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createProtocolStateMachine_3074(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ProtocolStateMachine");

+		Node label5130 = createLabel(node, UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeNameEditPartCN.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(ProtocolStateMachineCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "ProtocolStateMachine");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createStateMachine_3075(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(StateMachineCompositeEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "StateMachine");

+		Node label5131 = createLabel(node, UMLVisualIDRegistry.getType(StateMachineCompositeNameEditPartCN.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(StateMachineCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "StateMachine");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createFunctionBehavior_3076(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(FunctionBehaviorCompositeEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "FunctionBehavior");

+		Node label5132 = createLabel(node, UMLVisualIDRegistry.getType(FunctionBehaviorCompositeNameEditPartCN.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(FunctionBehaviorCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "FunctionBehavior");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createOpaqueBehavior_3077(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "OpaqueBehavior");

+		Node label5133 = createLabel(node, UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeNameEditPartCN.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(OpaqueBehaviorCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "OpaqueBehavior");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createComponent_3081(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(ComponentCompositeEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Component");

+		Node label5137 = createLabel(node, UMLVisualIDRegistry.getType(ComponentCompositeNameEditPartCN.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(ComponentCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Component");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createDevice_3082(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(DeviceCompositeEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Device");

+		Node label5138 = createLabel(node, UMLVisualIDRegistry.getType(DeviceCompositeNameEditPartCN.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(DeviceCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Device");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createExecutionEnvironment_3083(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "ExecutionEnvironment");

+		Node label5139 = createLabel(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeNameEditPartCN.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(ExecutionEnvironmentCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "ExecutionEnvironment");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createNode_3084(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(NodeCompositeEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Node");

+		Node label5140 = createLabel(node, UMLVisualIDRegistry.getType(NodeCompositeNameEditPartCN.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(NodeCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Node");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createClass_3085(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(ClassCompositeEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Class");

+		Node label5155 = createLabel(node, UMLVisualIDRegistry.getType(ClassCompositeNameEditPartCN.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(ClassCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Class");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createCollaboration_3086(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(CollaborationCompositeEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Collaboration");

+		Node label5141 = createLabel(node, UMLVisualIDRegistry.getType(CollaborationCompositeNameEditPartCN.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(CollaborationCompositeCompartmentEditPartCN.VISUAL_ID), true, true, false, false);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Collaboration");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createInterface_3087(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(InterfaceEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Interface");

+		Node label5154 = createLabel(node, UMLVisualIDRegistry.getType(InterfaceNameEditPartCN.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createPrimitiveType_3078(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(PrimitiveTypeEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "PrimitiveType");

+		Node label5134 = createLabel(node, UMLVisualIDRegistry.getType(PrimitiveTypeNameEditPartCN.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createEnumeration_3079(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(EnumerationEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Enumeration");

+		Node label5135 = createLabel(node, UMLVisualIDRegistry.getType(EnumerationNameEditPartCN.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(EnumerationEnumerationLiteralCompartmentEditPartCN.VISUAL_ID), true, true, true, true);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Enumeration");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createDataType_3080(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(DataTypeEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DataType");

+		Node label5136 = createLabel(node, UMLVisualIDRegistry.getType(DataTypeNameEditPartCN.VISUAL_ID));

+		createCompartment(node, UMLVisualIDRegistry.getType(DataTypeAttributeCompartmentEditPartCN.VISUAL_ID), true, true, true, true);

+		createCompartment(node, UMLVisualIDRegistry.getType(DataTypeOperationCompartmentEditPartCN.VISUAL_ID), true, true, true, true);

+		PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "DataType");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createActor_3091(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(ActorEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Actor");

+		Node label5144 = createLabel(node, UMLVisualIDRegistry.getType(ActorNameEditPartCN.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createDeploymentSpecification_3092(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(DeploymentSpecificationEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DeploymentSpecification");

+		Node label5145 = createLabel(node, UMLVisualIDRegistry.getType(DeploymentSpecificationNameEditPartCN.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createArtifact_3093(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(ArtifactEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Artifact");

+		Node label5146 = createLabel(node, UMLVisualIDRegistry.getType(ArtifactNameEditPartCN.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createInformationItem_3094(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(InformationItemEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "InformationItem");

+		Node label5147 = createLabel(node, UMLVisualIDRegistry.getType(InformationItemNameEditPartCN.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createSignal_3095(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(SignalEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Signal");

+		Node label5148 = createLabel(node, UMLVisualIDRegistry.getType(SignalNameEditPartCN.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createUseCase_3096(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(UseCaseEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "UseCase");

+		Node label5149 = createLabel(node, UMLVisualIDRegistry.getType(UseCaseNameEditPartCN.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createComment_3097(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		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.initFontStyleFromPrefs(node, prefStore, "Comment");

+		Node label5150 = createLabel(node, UMLVisualIDRegistry.getType(CommentBodyEditPartCN.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createDurationConstraint_3116(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(DurationConstraintEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "DurationConstraint");

+		Node label6040 = createLabel(node, UMLVisualIDRegistry.getType(DurationConstraintNameEditPartCN.VISUAL_ID));

+		Node label6041 = createLabel(node, UMLVisualIDRegistry.getType(DurationConstraintSpecificationEditPartCN.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createTimeConstraint_3117(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(TimeConstraintEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "TimeConstraint");

+		Node label6042 = createLabel(node, UMLVisualIDRegistry.getType(TimeConstraintNameEditPartCN.VISUAL_ID));

+		Node label6043 = createLabel(node, UMLVisualIDRegistry.getType(TimeConstraintSpecificationEditPartCN.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createIntervalConstraint_3118(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(IntervalConstraintEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "IntervalConstraint");

+		Node label6044 = createLabel(node, UMLVisualIDRegistry.getType(IntervalConstraintNameEditPartCN.VISUAL_ID));

+		Node label6045 = createLabel(node, UMLVisualIDRegistry.getType(IntervalConstraintSpecificationEditPartCN.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createInteractionConstraint_3119(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(InteractionConstraintEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "InteractionConstraint");

+		Node label6046 = createLabel(node, UMLVisualIDRegistry.getType(InteractionConstraintNameEditPartCN.VISUAL_ID));

+		Node label6047 = createLabel(node, UMLVisualIDRegistry.getType(InteractionConstraintSpecificationEditPartCN.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createConstraint_3120(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Shape node = NotationFactory.eINSTANCE.createShape();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+		node.setType(UMLVisualIDRegistry.getType(ConstraintEditPartCN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+		// initializeFromPreferences 

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Constraint");

+		Node label6048 = createLabel(node, UMLVisualIDRegistry.getType(ConstraintNameEditPartCN.VISUAL_ID));

+		Node label6049 = createLabel(node, UMLVisualIDRegistry.getType(ConstraintSpecificationEditPartCN.VISUAL_ID));

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createProperty_3101(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Node node = NotationFactory.eINSTANCE.createNode();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		node.setType(UMLVisualIDRegistry.getType(PropertyEditPartCLN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Property");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createOperation_3102(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Node node = NotationFactory.eINSTANCE.createNode();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		node.setType(UMLVisualIDRegistry.getType(OperationEditPartCLN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Operation");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Node createEnumerationLiteral_3066(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Node node = NotationFactory.eINSTANCE.createNode();

+		node.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		node.setType(UMLVisualIDRegistry.getType(EnumerationLiteralEditPartCLN.VISUAL_ID));

+		ViewUtil.insertChildView(containerView, node, index, persisted);

+		node.setElement(domainElement);

+

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "EnumerationLiteral");

+		return node;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Edge createLink_4022(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Connector edge = NotationFactory.eINSTANCE.createConnector();

+		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

+		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

+		List<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(BehaviorPortLinkEditPart.VISUAL_ID));

+		edge.setElement(null);

+		// initializePreferences

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		//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);

+		//}

+

+		return edge;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Edge createLink_4001(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Connector edge = NotationFactory.eINSTANCE.createConnector();

+		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

+		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

+		List<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(LinkDescriptorEditPart.VISUAL_ID));

+		edge.setElement(null);

+		// initializePreferences

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		//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);

+		//}

+

+		return edge;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Edge createCommentAnnotatedElement_4002(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Connector edge = NotationFactory.eINSTANCE.createConnector();

+		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

+		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

+		List<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.setElement(null);

+		// initializePreferences

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "CommentAnnotatedElement");

+		//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);

+		//}

+

+		return edge;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Edge createConstraintConstrainedElement_4003(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Connector edge = NotationFactory.eINSTANCE.createConnector();

+		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

+		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

+		List<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.setElement(null);

+		// initializePreferences

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "ConstraintConstrainedElement");

+		//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);

+		//}

+

+		return edge;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Edge createComponentRealization_4004(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();

+		List<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(ComponentRealizationEditPart.VISUAL_ID));

+		edge.setElement(domainElement);

+		// initializePreferences

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "ComponentRealization");

+		//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);

+		//}

+		Node label6001 = createLabel(edge, UMLVisualIDRegistry.getType(ComponentRealizationNameEditPart.VISUAL_ID));

+		label6001.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6001 = (Location)label6001.getLayoutConstraint();

+		location6001.setX(0);

+		location6001.setY(60);

+		Node label6015 = createLabel(edge, UMLVisualIDRegistry.getType(ComponentRealizationAppliedStereotypeEditPart.VISUAL_ID));

+		label6015.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6015 = (Location)label6015.getLayoutConstraint();

+		location6015.setX(0);

+		location6015.setY(30);

+

+		return edge;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Edge createInterfaceRealization_4005(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();

+		List<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(InterfaceRealizationEditPart.VISUAL_ID));

+		edge.setElement(domainElement);

+		// initializePreferences

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "InterfaceRealization");

+		//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);

+		//}

+		Node label6002 = createLabel(edge, UMLVisualIDRegistry.getType(InterfaceRealizationNameEditPart.VISUAL_ID));

+		label6002.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6002 = (Location)label6002.getLayoutConstraint();

+		location6002.setX(0);

+		location6002.setY(60);

+		Node label6016 = createLabel(edge, UMLVisualIDRegistry.getType(InterfaceRealizationAppliedStereotypeEditPart.VISUAL_ID));

+		label6016.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6016 = (Location)label6016.getLayoutConstraint();

+		location6016.setX(0);

+		location6016.setY(30);

+

+		return edge;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Edge createSubstitution_4011(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();

+		List<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(SubstitutionEditPart.VISUAL_ID));

+		edge.setElement(domainElement);

+		// initializePreferences

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Substitution");

+		//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);

+		//}

+		Node label6003 = createLabel(edge, UMLVisualIDRegistry.getType(SubstitutionNameEditPart.VISUAL_ID));

+		label6003.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6003 = (Location)label6003.getLayoutConstraint();

+		location6003.setX(0);

+		location6003.setY(60);

+		Node label6017 = createLabel(edge, UMLVisualIDRegistry.getType(SubstitutionAppliedStereotypeEditPart.VISUAL_ID));

+		label6017.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6017 = (Location)label6017.getLayoutConstraint();

+		location6017.setX(0);

+		location6017.setY(30);

+

+		return edge;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Edge createRealization_4006(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();

+		List<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(RealizationEditPart.VISUAL_ID));

+		edge.setElement(domainElement);

+		// initializePreferences

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		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);

+		//}

+		Node label6004 = createLabel(edge, UMLVisualIDRegistry.getType(RealizationNameEditPart.VISUAL_ID));

+		label6004.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6004 = (Location)label6004.getLayoutConstraint();

+		location6004.setX(0);

+		location6004.setY(60);

+		Node label6018 = createLabel(edge, UMLVisualIDRegistry.getType(RealizationAppliedStereotypeEditPart.VISUAL_ID));

+		label6018.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6018 = (Location)label6018.getLayoutConstraint();

+		location6018.setX(0);

+		location6018.setY(30);

+

+		return edge;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Edge createManifestation_4012(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();

+		List<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(ManifestationEditPart.VISUAL_ID));

+		edge.setElement(domainElement);

+		// initializePreferences

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Manifestation");

+		//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);

+		//}

+		Node label6005 = createLabel(edge, UMLVisualIDRegistry.getType(ManifestationNameEditPart.VISUAL_ID));

+		label6005.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6005 = (Location)label6005.getLayoutConstraint();

+		location6005.setX(0);

+		location6005.setY(60);

+		Node label6019 = createLabel(edge, UMLVisualIDRegistry.getType(ManifestationAppliedStereotypeEditPart.VISUAL_ID));

+		label6019.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6019 = (Location)label6019.getLayoutConstraint();

+		location6019.setX(0);

+		location6019.setY(30);

+

+		return edge;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Edge createAbstraction_4007(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();

+		List<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(AbstractionEditPart.VISUAL_ID));

+		edge.setElement(domainElement);

+		// initializePreferences

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		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);

+		//}

+		Node label6006 = createLabel(edge, UMLVisualIDRegistry.getType(AbstractionNameEditPart.VISUAL_ID));

+		label6006.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6006 = (Location)label6006.getLayoutConstraint();

+		location6006.setX(0);

+		location6006.setY(60);

+		Node label6020 = createLabel(edge, UMLVisualIDRegistry.getType(AbstractionAppliedStereotypeEditPart.VISUAL_ID));

+		label6020.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6020 = (Location)label6020.getLayoutConstraint();

+		location6020.setX(0);

+		location6020.setY(30);

+

+		return edge;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Edge createUsage_4008(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();

+		List<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(UsageEditPart.VISUAL_ID));

+		edge.setElement(domainElement);

+		// initializePreferences

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		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);

+		//}

+		Node label6007 = createLabel(edge, UMLVisualIDRegistry.getType(UsageNameEditPart.VISUAL_ID));

+		label6007.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6007 = (Location)label6007.getLayoutConstraint();

+		location6007.setX(0);

+		location6007.setY(60);

+		Node label6021 = createLabel(edge, UMLVisualIDRegistry.getType(UsageAppliedStereotypeEditPart.VISUAL_ID));

+		label6021.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6021 = (Location)label6021.getLayoutConstraint();

+		location6021.setX(0);

+		location6021.setY(30);

+

+		return edge;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Edge createDeployment_4009(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();

+		List<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(DeploymentEditPart.VISUAL_ID));

+		edge.setElement(domainElement);

+		// initializePreferences

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Deployment");

+		//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);

+		//}

+		Node label6008 = createLabel(edge, UMLVisualIDRegistry.getType(DeploymentNameEditPart.VISUAL_ID));

+		label6008.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6008 = (Location)label6008.getLayoutConstraint();

+		location6008.setX(0);

+		location6008.setY(60);

+		Node label6022 = createLabel(edge, UMLVisualIDRegistry.getType(DeploymentAppliedStereotypeEditPart.VISUAL_ID));

+		label6022.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6022 = (Location)label6022.getLayoutConstraint();

+		location6022.setX(0);

+		location6022.setY(30);

+

+		return edge;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Edge createDependency_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();

+		List<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(RoleBindingEditPart.VISUAL_ID));

+		edge.setElement(domainElement);

+		// initializePreferences

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "RoleBinding");

+		//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);

+		//}

+		Node label6027 = createLabel(edge, UMLVisualIDRegistry.getType(RoleBindingRoleNameEditPart.VISUAL_ID));

+		label6027.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6027 = (Location)label6027.getLayoutConstraint();

+		location6027.setX(0);

+		location6027.setY(20);

+		Node label6028 = createLabel(edge, UMLVisualIDRegistry.getType(RoleBindingAppliedStereotypeEditPart.VISUAL_ID));

+		label6028.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6028 = (Location)label6028.getLayoutConstraint();

+		location6028.setX(0);

+		location6028.setY(60);

+

+		return edge;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Edge createDependency_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();

+		List<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(DependencyEditPart.VISUAL_ID));

+		edge.setElement(domainElement);

+		// initializePreferences

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		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);

+		//}

+		Node label6009 = createLabel(edge, UMLVisualIDRegistry.getType(DependencyNameEditPart.VISUAL_ID));

+		label6009.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6009 = (Location)label6009.getLayoutConstraint();

+		location6009.setX(0);

+		location6009.setY(60);

+		Node label6023 = createLabel(edge, UMLVisualIDRegistry.getType(DependencyAppliedStereotypeEditPart.VISUAL_ID));

+		label6023.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6023 = (Location)label6023.getLayoutConstraint();

+		location6023.setX(0);

+		location6023.setY(60);

+

+		return edge;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Edge createConnector_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();

+		List<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(ConnectorEditPart.VISUAL_ID));

+		edge.setElement(domainElement);

+		// initializePreferences

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "Connector");

+		//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);

+		//}

+		Node label6025 = createLabel(edge, UMLVisualIDRegistry.getType(ConnectorAppliedStereotypeEditPart.VISUAL_ID));

+		label6025.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6025 = (Location)label6025.getLayoutConstraint();

+		location6025.setX(0);

+		location6025.setY(60);

+		Node label6050 = createLabel(edge, UMLVisualIDRegistry.getType(ConnectorNameEditPart.VISUAL_ID));

+		label6050.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6050 = (Location)label6050.getLayoutConstraint();

+		location6050.setX(0);

+		location6050.setY(-20);

+		Node label6051 = createLabel(edge, UMLVisualIDRegistry.getType(ConnectorMultiplicitySourceEditPart.VISUAL_ID));

+		label6051.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6051 = (Location)label6051.getLayoutConstraint();

+		location6051.setX(0);

+		location6051.setY(20);

+		Node label6052 = createLabel(edge, UMLVisualIDRegistry.getType(ConnectorMultiplicityTargetEditPart.VISUAL_ID));

+		label6052.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6052 = (Location)label6052.getLayoutConstraint();

+		location6052.setX(0);

+		location6052.setY(20);

+

+		return edge;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Edge createGeneralization_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();

+		List<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.setElement(domainElement);

+		// initializePreferences

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		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);

+		//}

+		Node label6024 = createLabel(edge, UMLVisualIDRegistry.getType(GeneralizationAppliedStereotypeEditPart.VISUAL_ID));

+		label6024.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6024 = (Location)label6024.getLayoutConstraint();

+		location6024.setX(0);

+		location6024.setY(60);

+

+		return edge;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Edge createTimeObservationEvent_4018(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Connector edge = NotationFactory.eINSTANCE.createConnector();

+		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

+		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

+		List<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(TimeObservationEventEditPart.VISUAL_ID));

+		edge.setElement(null);

+		// initializePreferences

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "TimeObservationEvent");

+		//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);

+		//}

+

+		return edge;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Edge createDurationObservationEvent_4019(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Connector edge = NotationFactory.eINSTANCE.createConnector();

+		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

+		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

+		List<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(DurationObservationEventEditPart.VISUAL_ID));

+		edge.setElement(null);

+		// initializePreferences

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "DurationObservationEvent");

+		//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);

+		//}

+

+		return edge;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Edge createInformationItemRepresented_4020(View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {

+		Connector edge = NotationFactory.eINSTANCE.createConnector();

+		edge.getStyles().add(NotationFactory.eINSTANCE.createFontStyle());

+		RelativeBendpoints bendpoints = NotationFactory.eINSTANCE.createRelativeBendpoints();

+		List<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(RepresentationEditPart.VISUAL_ID));

+		edge.setElement(null);

+		// initializePreferences

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		ViewUtil.setStructuralFeatureValue(edge, NotationPackage.eINSTANCE.getLineStyle_LineColor(), FigureUtilities.colorToInteger(ColorConstants.black));

+		//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);

+		//}

+		Node label6030 = createLabel(edge, UMLVisualIDRegistry.getType(RepresentationTagLabelEditPart.VISUAL_ID));

+		label6030.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6030 = (Location)label6030.getLayoutConstraint();

+		location6030.setX(0);

+		location6030.setY(15);

+

+		return edge;

+	}

+

+	/**

+	 * @generated

+	 */

+	public Edge createInformationFlow_4021(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();

+		List<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(InformationFlowEditPart.VISUAL_ID));

+		edge.setElement(domainElement);

+		// initializePreferences

+		final IPreferenceStore prefStore = (IPreferenceStore)preferencesHint.getPreferenceStore();

+

+		PreferenceInitializerForElementHelper.initFontStyleFromPrefs(edge, prefStore, "InformationFlow");

+		//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);

+		//}

+		Node label6031 = createLabel(edge, UMLVisualIDRegistry.getType(InformationFlowConveyedLabelEditPart.VISUAL_ID));

+		label6031.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6031 = (Location)label6031.getLayoutConstraint();

+		location6031.setX(0);

+		location6031.setY(30);

+		Node label6032 = createLabel(edge, UMLVisualIDRegistry.getType(InformationFlowAppliedStereotypeEditPart.VISUAL_ID));

+		label6032.setLayoutConstraint(NotationFactory.eINSTANCE.createLocation());

+		Location location6032 = (Location)label6032.getLayoutConstraint();

+		location6032.setX(0);

+		location6032.setY(15);

+

+		return edge;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected void stampShortcut(View containerView, Node target) {

+		if(!CompositeStructureDiagramEditPart.MODEL_ID.equals(UMLVisualIDRegistry.getModelID(containerView))) {

+			EAnnotation shortcutAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();

+			shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$

+			shortcutAnnotation.getDetails().put("modelID", CompositeStructureDiagramEditPart.MODEL_ID); //$NON-NLS-1$

+			target.getEAnnotations().add(shortcutAnnotation);

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	protected Node createLabel(View owner, String hint) {

+		DecorationNode rv = NotationFactory.eINSTANCE.createDecorationNode();

+		rv.setType(hint);

+		ViewUtil.insertChildView(owner, rv, ViewUtil.APPEND, true);

+		return rv;

+	}

+

+	/**

+	 * @generated

+	 */

+	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) {

+			rv = NotationFactory.eINSTANCE.createBasicCompartment();

+		} else {

+			rv = NotationFactory.eINSTANCE.createDecorationNode();

+		}

+

+		rv.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());

+

+		if(hasTitle) {

+			TitleStyle ts = NotationFactory.eINSTANCE.createTitleStyle();

+			rv.getStyles().add(ts);

+		}

+		if(canSort) {

+			rv.getStyles().add(NotationFactory.eINSTANCE.createSortingStyle());

+		}

+		if(canFilter) {

+			rv.getStyles().add(NotationFactory.eINSTANCE.createFilteringStyle());

+		}

+		rv.setType(hint);

+		ViewUtil.insertChildView(owner, rv, ViewUtil.APPEND, true);

+		return rv;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected EObject getSemanticElement(IAdaptable semanticAdapter) {

+		if(semanticAdapter == null) {

+			return null;

+		}

+		EObject eObject = (EObject)semanticAdapter.getAdapter(EObject.class);

+		if(eObject != null) {

+			return EMFCoreUtil.resolve(TransactionUtil.getEditingDomain(eObject), eObject);

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	protected IElementType getSemanticElementType(IAdaptable semanticAdapter) {

+		if(semanticAdapter == null) {

+			return null;

+		}

+		return (IElementType)semanticAdapter.getAdapter(IElementType.class);

+	}

+

+	/**

+	 * @generated

+	 */

+	private void initFontStyleFromPrefs(View view, final IPreferenceStore store, String elementName) {

+		String fontConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.FONT);

+		String fontColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.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());

+		}

+	}

+

+	/**

+	 * @generated

+	 */

+	private void initForegroundFromPrefs(View view, final IPreferenceStore store, String elementName) {

+		String lineColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.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 = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_FILL);

+		String gradientColorConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.COLOR_GRADIENT);

+		String gradientPolicyConstant = PreferencesConstantsHelper.getElementConstant(elementName, PreferencesConstantsHelper.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());

+		}

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLPropertySection.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLPropertySection.java
index c9d7bba27ce..07ebef74d34 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLPropertySection.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLPropertySection.java
@@ -1,30 +1,32 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.sheet;
-
-import org.eclipse.gmf.tooling.runtime.sheet.DefaultPropertySection;
-import org.eclipse.ui.views.properties.IPropertySourceProvider;
-
-/**
- * @generated
- */
-public class UMLPropertySection extends DefaultPropertySection implements IPropertySourceProvider {
-	/**
-	 * Modify/unwrap selection.
-	 * @generated
-	 */
-	@Override
-	protected Object transformSelection(Object selected) {
-		selected = /*super.*/transformSelectionToDomain(selected);
-		return selected;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.sheet;

+

+import org.eclipse.gmf.tooling.runtime.sheet.DefaultPropertySection;

+import org.eclipse.ui.views.properties.IPropertySourceProvider;

+

+/**

+ * @generated

+ */

+public class UMLPropertySection extends DefaultPropertySection implements IPropertySourceProvider {

+

+	/**

+	 * Modify/unwrap selection.

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected Object transformSelection(Object selected) {

+		selected = /* super. */transformSelectionToDomain(selected);

+		return selected;

+	}

+}

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLSheetLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLSheetLabelProvider.java
index b051e2840a2..3a38ba42304 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLSheetLabelProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/sheet/UMLSheetLabelProvider.java
@@ -1,85 +1,84 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-package org.eclipse.papyrus.uml.diagram.composite.sheet;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.jface.viewers.BaseLabelProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;
-import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @generated
- */
-public class UMLSheetLabelProvider extends BaseLabelProvider implements ILabelProvider {
-	/**
-	 * @generated
-	 */
-	public String getText(Object element) {
-		element = unwrap(element);
-		IElementType etype = getElementType(getView(element));
-		return etype == null ? "" : etype.getDisplayName();
-	}
-
-	/**
-	 * @generated
-	 */
-	public Image getImage(Object element) {
-		IElementType etype = getElementType(getView(unwrap(element)));
-		return etype == null ? null : UMLElementTypes.getImage(etype);
-	}
-
-	/**
-	 * @generated
-	 */
-	private Object unwrap(Object element) {
-		if (element instanceof IStructuredSelection) {
-			return ((IStructuredSelection) element).getFirstElement();
-		}
-		return element;
-	}
-
-	/**
-	 * @generated
-	 */
-	private View getView(Object element) {
-		if (element instanceof View) {
-			return (View) element;
-		}
-		if (element instanceof IAdaptable) {
-			return (View) ((IAdaptable) element).getAdapter(View.class);
-		}
-		return null;
-	}
-
-	/**
-	 * @generated
-	 */
-	private IElementType getElementType(View view) {
-		// For intermediate views climb up the containment hierarchy to find the one associated with an element type.
-		while (view != null) {
-			int vid = UMLVisualIDRegistry.getVisualID(view);
-			IElementType etype =
-					UMLElementTypes.getElementType(vid);
-			if (etype != null) {
-				return etype;
-			}
-			view = view.eContainer() instanceof View ?
-					(View) view.eContainer() : null;
-		}
-		return null;
-	}
-}
+/**

+ * Copyright (c) 2014 CEA LIST.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

+ */

+package org.eclipse.papyrus.uml.diagram.composite.sheet;

+

+import org.eclipse.core.runtime.IAdaptable;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.jface.viewers.BaseLabelProvider;

+import org.eclipse.jface.viewers.ILabelProvider;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.papyrus.uml.diagram.composite.part.UMLVisualIDRegistry;

+import org.eclipse.papyrus.uml.diagram.composite.providers.UMLElementTypes;

+import org.eclipse.swt.graphics.Image;

+

+/**

+ * @generated

+ */

+public class UMLSheetLabelProvider extends BaseLabelProvider implements ILabelProvider {

+

+	/**

+	 * @generated

+	 */

+	public String getText(Object element) {

+		element = unwrap(element);

+		IElementType etype = getElementType(getView(element));

+		return etype == null ? "" : etype.getDisplayName();

+	}

+

+	/**

+	 * @generated

+	 */

+	public Image getImage(Object element) {

+		IElementType etype = getElementType(getView(unwrap(element)));

+		return etype == null ? null : UMLElementTypes.getImage(etype);

+	}

+

+	/**

+	 * @generated

+	 */

+	private Object unwrap(Object element) {

+		if(element instanceof IStructuredSelection) {

+			return ((IStructuredSelection)element).getFirstElement();

+		}

+		return element;

+	}

+

+	/**

+	 * @generated

+	 */

+	private View getView(Object element) {

+		if(element instanceof View) {

+			return (View)element;

+		}

+		if(element instanceof IAdaptable) {

+			return (View)((IAdaptable)element).getAdapter(View.class);

+		}

+		return null;

+	}

+

+	/**

+	 * @generated

+	 */

+	private IElementType getElementType(View view) {

+		// For intermediate views climb up the containment hierarchy to find the one associated with an element type.

+		while(view != null) {

+			int vid = UMLVisualIDRegistry.getVisualID(view);

+			IElementType etype = UMLElementTypes.getElementType(vid);

+			if(etype != null) {

+				return etype;

+			}

+			view = view.eContainer() instanceof View ? (View)view.eContainer() : null;

+		}

+		return null;

+	}

+}